Index: chrome/browser/background/background_mode_manager_unittest.cc |
diff --git a/chrome/browser/background/background_mode_manager_unittest.cc b/chrome/browser/background/background_mode_manager_unittest.cc |
index 67e41e2e90629490e6b5de431d4113fc5ab11b73..d8e9930065a0a6f0ace016c244b44e70f4ec0ce5 100644 |
--- a/chrome/browser/background/background_mode_manager_unittest.cc |
+++ b/chrome/browser/background/background_mode_manager_unittest.cc |
@@ -47,16 +47,16 @@ class SimpleTestBackgroundModeManager : public BackgroundModeManager { |
ResumeBackgroundMode(); |
} |
- virtual void EnableLaunchOnStartup(bool launch) override { |
+ void EnableLaunchOnStartup(bool launch) override { |
launch_on_startup_ = launch; |
} |
- virtual void DisplayAppInstalledNotification( |
+ void DisplayAppInstalledNotification( |
const extensions::Extension* extension) override { |
has_shown_balloon_ = true; |
} |
- virtual void CreateStatusTrayIcon() override { have_status_tray_ = true; } |
- virtual void RemoveStatusTrayIcon() override { have_status_tray_ = false; } |
+ void CreateStatusTrayIcon() override { have_status_tray_ = true; } |
+ void RemoveStatusTrayIcon() override { have_status_tray_ = false; } |
bool HaveStatusTray() const { return have_status_tray_; } |
bool IsLaunchOnStartup() const { return launch_on_startup_; } |
@@ -75,13 +75,12 @@ class SimpleTestBackgroundModeManager : public BackgroundModeManager { |
class TestStatusIcon : public StatusIcon { |
public: |
TestStatusIcon() {} |
- virtual void SetImage(const gfx::ImageSkia& image) override {} |
- virtual void SetToolTip(const base::string16& tool_tip) override {} |
- virtual void DisplayBalloon(const gfx::ImageSkia& icon, |
- const base::string16& title, |
- const base::string16& contents) override {} |
- virtual void UpdatePlatformContextMenu( |
- StatusIconMenuModel* menu) override {} |
+ void SetImage(const gfx::ImageSkia& image) override {} |
+ void SetToolTip(const base::string16& tool_tip) override {} |
+ void DisplayBalloon(const gfx::ImageSkia& icon, |
+ const base::string16& title, |
+ const base::string16& contents) override {} |
+ void UpdatePlatformContextMenu(StatusIconMenuModel* menu) override {} |
private: |
DISALLOW_COPY_AND_ASSIGN(TestStatusIcon); |
@@ -103,9 +102,8 @@ class TestBackgroundModeManager : public SimpleTestBackgroundModeManager { |
ResumeBackgroundMode(); |
} |
- virtual int GetBackgroundAppCount() const override { return app_count_; } |
- virtual int GetBackgroundAppCountForProfile( |
- Profile* const profile) const override { |
+ int GetBackgroundAppCount() const override { return app_count_; } |
+ int GetBackgroundAppCountForProfile(Profile* const profile) const override { |
return profile_app_count_; |
} |
void SetBackgroundAppCount(int count) { app_count_ = count; } |
@@ -116,7 +114,7 @@ class TestBackgroundModeManager : public SimpleTestBackgroundModeManager { |
enabled_ = enabled; |
OnBackgroundModeEnabledPrefChanged(); |
} |
- virtual bool IsBackgroundModePrefEnabled() const override { return enabled_; } |
+ bool IsBackgroundModePrefEnabled() const override { return enabled_; } |
private: |
bool enabled_; |