Replace OVERRIDE and FINAL with override and final in src/apps

BUG=417463

Review URL: https://codereview.chromium.org/641963002

Cr-Commit-Position: refs/heads/master@{#298808}

12 files changed, 55 insertions, 55 deletions

diff --git a/apps/app_lifetime_monitor.h b/apps/app_lifetime_monitor.h
index 9dfee75..dfaebef 100644
--- a/apps/app_lifetime_monitor.h
+++ b/apps/app_lifetime_monitor.h
@@ -58,15 +58,15 @@ class AppLifetimeMonitor : public KeyedService,
   // content::NotificationObserver overrides:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // extensions::AppWindowRegistry::Observer overrides:
-  virtual void OnAppWindowRemoved(extensions::AppWindow* app_window) OVERRIDE;
-  virtual void OnAppWindowHidden(extensions::AppWindow* app_window) OVERRIDE;
-  virtual void OnAppWindowShown(extensions::AppWindow* app_window) OVERRIDE;
+  virtual void OnAppWindowRemoved(extensions::AppWindow* app_window) override;
+  virtual void OnAppWindowHidden(extensions::AppWindow* app_window) override;
+  virtual void OnAppWindowShown(extensions::AppWindow* app_window) override;
 
   // KeyedService overrides:
-  virtual void Shutdown() OVERRIDE;
+  virtual void Shutdown() override;
 
   bool HasVisibleAppWindows(extensions::AppWindow* app_window) const;
 
diff --git a/apps/app_lifetime_monitor_factory.h b/apps/app_lifetime_monitor_factory.h
index 9732b74..466c8ed 100644
--- a/apps/app_lifetime_monitor_factory.h
+++ b/apps/app_lifetime_monitor_factory.h
@@ -31,10 +31,10 @@ class AppLifetimeMonitorFactory : public BrowserContextKeyedServiceFactory {
 
   // BrowserContextKeyedServiceFactory:
   virtual KeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* profile) const OVERRIDE;
-  virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE;
+      content::BrowserContext* profile) const override;
+  virtual bool ServiceIsCreatedWithBrowserContext() const override;
   virtual content::BrowserContext* GetBrowserContextToUse(
-    content::BrowserContext* context) const OVERRIDE;
+    content::BrowserContext* context) const override;
 };
 
 }  // namespace apps
diff --git a/apps/app_load_service.h b/apps/app_load_service.h
index 041b1ab..566672e 100644
--- a/apps/app_load_service.h
+++ b/apps/app_load_service.h
@@ -67,13 +67,13 @@ class AppLoadService : public KeyedService,
   // content::NotificationObserver.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // extensions::ExtensionRegistryObserver.
   virtual void OnExtensionUnloaded(
       content::BrowserContext* browser_context,
       const extensions::Extension* extension,
-      extensions::UnloadedExtensionInfo::Reason reason) OVERRIDE;
+      extensions::UnloadedExtensionInfo::Reason reason) override;
 
   bool WasUnloadedForReload(
       const extensions::ExtensionId& extension_id,
diff --git a/apps/app_load_service_factory.h b/apps/app_load_service_factory.h
index 61b2110..fec014c 100644
--- a/apps/app_load_service_factory.h
+++ b/apps/app_load_service_factory.h
@@ -28,11 +28,11 @@ class AppLoadServiceFactory : public BrowserContextKeyedServiceFactory {
 
   // BrowserContextKeyedServiceFactory:
   virtual KeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* context) const OVERRIDE;
-  virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE;
-  virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;
+      content::BrowserContext* context) const override;
+  virtual bool ServiceIsCreatedWithBrowserContext() const override;
+  virtual bool ServiceIsNULLWhileTesting() const override;
   virtual content::BrowserContext* GetBrowserContextToUse(
-      content::BrowserContext* context) const OVERRIDE;
+      content::BrowserContext* context) const override;
 };
 
 }  // namespace apps
diff --git a/apps/app_restore_service.h b/apps/app_restore_service.h
index 125d50c..5738b05 100644
--- a/apps/app_restore_service.h
+++ b/apps/app_restore_service.h
@@ -42,16 +42,16 @@ class AppRestoreService : public KeyedService,
 
  private:
   // AppLifetimeMonitor::Observer.
-  virtual void OnAppStart(Profile* profile, const std::string& app_id) OVERRIDE;
+  virtual void OnAppStart(Profile* profile, const std::string& app_id) override;
   virtual void OnAppActivated(Profile* profile,
-                              const std::string& app_id) OVERRIDE;
+                              const std::string& app_id) override;
   virtual void OnAppDeactivated(Profile* profile,
-                                const std::string& app_id) OVERRIDE;
-  virtual void OnAppStop(Profile* profile, const std::string& app_id) OVERRIDE;
-  virtual void OnChromeTerminating() OVERRIDE;
+                                const std::string& app_id) override;
+  virtual void OnAppStop(Profile* profile, const std::string& app_id) override;
+  virtual void OnChromeTerminating() override;
 
   // KeyedService.
-  virtual void Shutdown() OVERRIDE;
+  virtual void Shutdown() override;
 
   void RecordAppStart(const std::string& extension_id);
   void RecordAppStop(const std::string& extension_id);
diff --git a/apps/app_restore_service_factory.h b/apps/app_restore_service_factory.h
index 80f8fb0..676d4c2 100644
--- a/apps/app_restore_service_factory.h
+++ b/apps/app_restore_service_factory.h
@@ -31,8 +31,8 @@ class AppRestoreServiceFactory : public BrowserContextKeyedServiceFactory {
 
   // BrowserContextKeyedServiceFactory:
   virtual KeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* profile) const OVERRIDE;
-  virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE;
+      content::BrowserContext* profile) const override;
+  virtual bool ServiceIsCreatedWithBrowserContext() const override;
 };
 
 }  // namespace apps
diff --git a/apps/custom_launcher_page_contents.h b/apps/custom_launcher_page_contents.h
index eaa7673..8465a05 100644
--- a/apps/custom_launcher_page_contents.h
+++ b/apps/custom_launcher_page_contents.h
@@ -44,46 +44,46 @@ class CustomLauncherPageContents
   // content::WebContentsDelegate overrides:
   virtual content::WebContents* OpenURLFromTab(
       content::WebContents* source,
-      const content::OpenURLParams& params) OVERRIDE;
+      const content::OpenURLParams& params) override;
   virtual void AddNewContents(content::WebContents* source,
                               content::WebContents* new_contents,
                               WindowOpenDisposition disposition,
                               const gfx::Rect& initial_pos,
                               bool user_gesture,
-                              bool* was_blocked) OVERRIDE;
+                              bool* was_blocked) override;
   virtual bool IsPopupOrPanel(
-      const content::WebContents* source) const OVERRIDE;
-  virtual bool ShouldSuppressDialogs() OVERRIDE;
+      const content::WebContents* source) const override;
+  virtual bool ShouldSuppressDialogs() override;
   virtual bool PreHandleGestureEvent(
       content::WebContents* source,
-      const blink::WebGestureEvent& event) OVERRIDE;
+      const blink::WebGestureEvent& event) override;
   virtual content::ColorChooser* OpenColorChooser(
       content::WebContents* web_contents,
       SkColor color,
-      const std::vector<content::ColorSuggestion>& suggestions) OVERRIDE;
+      const std::vector<content::ColorSuggestion>& suggestions) override;
   virtual void RunFileChooser(
       content::WebContents* tab,
-      const content::FileChooserParams& params) OVERRIDE;
+      const content::FileChooserParams& params) override;
   virtual void RequestToLockMouse(content::WebContents* web_contents,
                                   bool user_gesture,
-                                  bool last_unlocked_by_target) OVERRIDE;
+                                  bool last_unlocked_by_target) override;
   virtual void RequestMediaAccessPermission(
       content::WebContents* web_contents,
       const content::MediaStreamRequest& request,
-      const content::MediaResponseCallback& callback) OVERRIDE;
+      const content::MediaResponseCallback& callback) override;
   virtual bool CheckMediaAccessPermission(
       content::WebContents* web_contents,
       const GURL& security_origin,
-      content::MediaStreamType type) OVERRIDE;
+      content::MediaStreamType type) override;
 
  private:
   // content::WebContentsObserver overrides:
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   // extensions::ExtensionFunctionDispatcher::Delegate overrides:
   virtual extensions::WindowController* GetExtensionWindowController()
-      const OVERRIDE;
-  virtual content::WebContents* GetAssociatedWebContents() const OVERRIDE;
+      const override;
+  virtual content::WebContents* GetAssociatedWebContents() const override;
 
   void OnRequest(const ExtensionHostMsg_Request_Params& params);
 
diff --git a/apps/load_and_launch_browsertest.cc b/apps/load_and_launch_browsertest.cc
index d63772b..ced6564 100644
--- a/apps/load_and_launch_browsertest.cc
+++ b/apps/load_and_launch_browsertest.cc
@@ -109,7 +109,7 @@ class PlatformAppLoadAndLaunchBrowserTest : public PlatformAppBrowserTest {
  protected:
   PlatformAppLoadAndLaunchBrowserTest() {}
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     PlatformAppBrowserTest::SetUpCommandLine(command_line);
     app_path_ = test_data_dir_
         .AppendASCII("platform_apps")
diff --git a/apps/saved_files_service.h b/apps/saved_files_service.h
index aa7909b..d696c79 100644
--- a/apps/saved_files_service.h
+++ b/apps/saved_files_service.h
@@ -111,7 +111,7 @@ class SavedFilesService : public KeyedService,
   // content::NotificationObserver.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // Returns the SavedFiles for |extension_id| or NULL if one does not exist.
   SavedFiles* Get(const std::string& extension_id) const;
diff --git a/apps/saved_files_service_factory.h b/apps/saved_files_service_factory.h
index d8bc3ee..7d4c15c 100644
--- a/apps/saved_files_service_factory.h
+++ b/apps/saved_files_service_factory.h
@@ -27,7 +27,7 @@ class SavedFilesServiceFactory : public BrowserContextKeyedServiceFactory {
   friend struct DefaultSingletonTraits<SavedFilesServiceFactory>;
 
   virtual KeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* profile) const OVERRIDE;
+      content::BrowserContext* profile) const override;
 };
 
 }  // namespace apps
diff --git a/apps/saved_files_service_unittest.cc b/apps/saved_files_service_unittest.cc
index 3480415..0adbe34 100644
--- a/apps/saved_files_service_unittest.cc
+++ b/apps/saved_files_service_unittest.cc
@@ -35,7 +35,7 @@ std::string GenerateId(int i) {
 
 class SavedFilesServiceUnitTest : public testing::Test {
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     testing::Test::SetUp();
     extension_ = env_.MakeExtension(*base::test::ParseJson(
         "{"
@@ -52,7 +52,7 @@ class SavedFilesServiceUnitTest : public testing::Test {
     path_ = base::FilePath(FILE_PATH_LITERAL("filename.ext"));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     SavedFilesService::ClearMaxSequenceNumberForTest();
     SavedFilesService::ClearLruSizeForTest();
     testing::Test::TearDown();
diff --git a/apps/ui/views/app_window_frame_view.h b/apps/ui/views/app_window_frame_view.h
index 7ab2d4c..2baa24e 100644
--- a/apps/ui/views/app_window_frame_view.h
+++ b/apps/ui/views/app_window_frame_view.h
@@ -68,28 +68,28 @@ class AppWindowFrameView : public views::NonClientFrameView,
 
  private:
   // views::NonClientFrameView implementation.
-  virtual gfx::Rect GetBoundsForClientView() const OVERRIDE;
+  virtual gfx::Rect GetBoundsForClientView() const override;
   virtual gfx::Rect GetWindowBoundsForClientBounds(
-      const gfx::Rect& client_bounds) const OVERRIDE;
-  virtual int NonClientHitTest(const gfx::Point& point) OVERRIDE;
+      const gfx::Rect& client_bounds) const override;
+  virtual int NonClientHitTest(const gfx::Point& point) override;
   virtual void GetWindowMask(const gfx::Size& size,
-                             gfx::Path* window_mask) OVERRIDE;
-  virtual void ResetWindowControls() OVERRIDE {}
-  virtual void UpdateWindowIcon() OVERRIDE {}
-  virtual void UpdateWindowTitle() OVERRIDE {}
-  virtual void SizeConstraintsChanged() OVERRIDE;
+                             gfx::Path* window_mask) override;
+  virtual void ResetWindowControls() override {}
+  virtual void UpdateWindowIcon() override {}
+  virtual void UpdateWindowTitle() override {}
+  virtual void SizeConstraintsChanged() override;
 
   // views::View implementation.
-  virtual gfx::Size GetPreferredSize() const OVERRIDE;
-  virtual void Layout() OVERRIDE;
-  virtual const char* GetClassName() const OVERRIDE;
-  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
-  virtual gfx::Size GetMinimumSize() const OVERRIDE;
-  virtual gfx::Size GetMaximumSize() const OVERRIDE;
+  virtual gfx::Size GetPreferredSize() const override;
+  virtual void Layout() override;
+  virtual const char* GetClassName() const override;
+  virtual void OnPaint(gfx::Canvas* canvas) override;
+  virtual gfx::Size GetMinimumSize() const override;
+  virtual gfx::Size GetMaximumSize() const override;
 
   // views::ButtonListener implementation.
   virtual void ButtonPressed(views::Button* sender,
-                             const ui::Event& event) OVERRIDE;
+                             const ui::Event& event) override;
 
   // Some button images we use depend on the color of the frame. This
   // will set these images based on the color of the frame.