Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit efec0b36 authored by Ben Chan's avatar Ben Chan Committed by chrome-internal-fetch
Browse files

crash-reporter: Use C++11 override specifier. 

Also remove some unnecessary 'void' arguments.

BUG=None
TEST=`FEATURES=test emerge-$BOARD crash-reporter`

Change-Id: I0039aec93aae14cb238f284fda756b631f9c1587
Reviewed-on: https://chromium-review.googlesource.com/211959


Reviewed-by: default avatarMike Frysinger <vapier@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
Tested-by: default avatarBen Chan <benchan@chromium.org>
parent eaf060c2

crash_reporter/chrome_collector.h

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ class SystemLogging; 
class ChromeCollector : public CrashCollector {

 public:

  ChromeCollector();

  virtual ~ChromeCollector();

  ~ChromeCollector() override;



  // Magic string to let Chrome know the crash report succeeded.

  static const char kSuccessMagic[];

crash_reporter/crash_collector.cc

+2 −2
Original line number Diff line number Diff line
@@ -154,7 +154,7 @@ const char *GetGErrorMessage(const GError *error) { 


}



GHashTable *CrashCollector::GetActiveUserSessions(void) {

GHashTable *CrashCollector::GetActiveUserSessions() {

  GHashTable *active_sessions = NULL;



  chromeos::dbus::BusConnection dbus = chromeos::dbus::GetSystemBusConnection();
@@ -189,7 +189,7 @@ GHashTable *CrashCollector::GetActiveUserSessions(void) { 
  return active_sessions;

}



FilePath CrashCollector::GetUserCrashPath(void) {

FilePath CrashCollector::GetUserCrashPath() {

  // In this multiprofile world, there is no one-specific user dir anymore.

  // Ask the session manager for the active ones, then just run with the

  // first result we get back.

crash_reporter/crash_collector.h

+2 −2
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ class CrashCollector { 
    forced_crash_directory_ = forced_directory;

  }



  virtual GHashTable *GetActiveUserSessions(void);

  base::FilePath GetUserCrashPath(void);

  virtual GHashTable *GetActiveUserSessions();

  base::FilePath GetUserCrashPath();

  base::FilePath GetCrashDirectoryInfo(uid_t process_euid,

                                 uid_t default_user_id,

                                 gid_t default_user_group,

crash_reporter/kernel_collector.h

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ class KernelCollector : public CrashCollector { 


  KernelCollector();



  virtual ~KernelCollector();

  ~KernelCollector() override;



  void OverridePreservedDumpPath(const base::FilePath &file_path);
@@ -65,7 +65,7 @@ class KernelCollector : public CrashCollector { 
  void StripSensitiveData(std::string *kernel_dump);



  void GetRamoopsRecordPath(base::FilePath *path, size_t record);

  virtual bool LoadParameters();

  bool LoadParameters();

  bool HasMoreRecords();



  // Read a record to string, modified from file_utils since that didn't

crash_reporter/kernel_warning_collector.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ class KernelWarningCollector : public CrashCollector { 
 public:

  KernelWarningCollector();



  virtual ~KernelWarningCollector();

  ~KernelWarningCollector() override;



  // Collects warning.

  bool Collect();