replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]*

BUG=417463

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

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

522 files changed, 3357 insertions, 3357 deletions

diff --git a/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.h b/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.h
index 6f4f181..90663a7 100644
--- a/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.h
+++ b/chrome/browser/ui/android/autofill/autofill_dialog_controller_android.h
@@ -32,9 +32,9 @@ class AutofillDialogControllerAndroid : public AutofillDialogController {
   virtual ~AutofillDialogControllerAndroid();
 
   // AutofillDialogController implementation:
-  virtual void Show() OVERRIDE;
-  virtual void Hide() OVERRIDE;
-  virtual void TabActivated() OVERRIDE;
+  virtual void Show() override;
+  virtual void Hide() override;
+  virtual void TabActivated() override;
 
   // JNI bindings for Java-side AutofillDialogDelegate:
   void DialogCancel(JNIEnv* env, jobject obj);
diff --git a/chrome/browser/ui/android/autofill/autofill_popup_view_android.h b/chrome/browser/ui/android/autofill/autofill_popup_view_android.h
index 0dba912..d6c7c74 100644
--- a/chrome/browser/ui/android/autofill/autofill_popup_view_android.h
+++ b/chrome/browser/ui/android/autofill/autofill_popup_view_android.h
@@ -35,10 +35,10 @@ class AutofillPopupViewAndroid : public AutofillPopupView {
 
  protected:
   // AutofillPopupView implementation.
-  virtual void Show() OVERRIDE;
-  virtual void Hide() OVERRIDE;
-  virtual void InvalidateRow(size_t row) OVERRIDE;
-  virtual void UpdateBoundsAndRedrawPopup() OVERRIDE;
+  virtual void Show() override;
+  virtual void Hide() override;
+  virtual void InvalidateRow(size_t row) override;
+  virtual void UpdateBoundsAndRedrawPopup() override;
 
  private:
   virtual ~AutofillPopupViewAndroid();
diff --git a/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.h b/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.h
index a7edb68..6a1790e 100644
--- a/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.h
+++ b/chrome/browser/ui/android/content_settings/popup_blocked_infobar_delegate.h
@@ -28,12 +28,12 @@ class PopupBlockedInfoBarDelegate : public ConfirmInfoBarDelegate {
                               HostContentSettingsMap* map);
 
   // ConfirmInfoBarDelegate:
-  virtual int GetIconID() const OVERRIDE;
-  virtual PopupBlockedInfoBarDelegate* AsPopupBlockedInfoBarDelegate() OVERRIDE;
-  virtual base::string16 GetMessageText() const OVERRIDE;
-  virtual int GetButtons() const OVERRIDE;
-  virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
-  virtual bool Accept() OVERRIDE;
+  virtual int GetIconID() const override;
+  virtual PopupBlockedInfoBarDelegate* AsPopupBlockedInfoBarDelegate() override;
+  virtual base::string16 GetMessageText() const override;
+  virtual int GetButtons() const override;
+  virtual base::string16 GetButtonLabel(InfoBarButton button) const override;
+  virtual bool Accept() override;
 
   int num_popups_;
   GURL url_;
diff --git a/chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.h b/chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.h
index 293c9aa..0d91443 100644
--- a/chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.h
+++ b/chrome/browser/ui/android/infobars/auto_login_infobar_delegate_android.h
@@ -15,9 +15,9 @@ class AutoLoginInfoBarDelegateAndroid : public AutoLoginInfoBarDelegate {
   virtual ~AutoLoginInfoBarDelegateAndroid();
 
   // AutoLoginInfoBarDelegate:
-  virtual bool Accept() OVERRIDE;
-  virtual bool Cancel() OVERRIDE;
-  virtual base::string16 GetMessageText() const OVERRIDE;
+  virtual bool Accept() override;
+  virtual bool Cancel() override;
+  virtual base::string16 GetMessageText() const override;
 
   // These methods are defined in downstream code.
   bool AttachAccount(JavaObjectWeakGlobalRef weak_java_translate_helper);
diff --git a/chrome/browser/ui/android/infobars/auto_login_prompter.h b/chrome/browser/ui/android/infobars/auto_login_prompter.h
index bfeb290..d7953de 100644
--- a/chrome/browser/ui/android/infobars/auto_login_prompter.h
+++ b/chrome/browser/ui/android/infobars/auto_login_prompter.h
@@ -51,9 +51,9 @@ class AutoLoginPrompter : public content::WebContentsObserver {
                                   int route_id);
 
   virtual void DidStopLoading(
-      content::RenderViewHost* render_view_host) OVERRIDE;
+      content::RenderViewHost* render_view_host) override;
 
-  virtual void WebContentsDestroyed() OVERRIDE;
+  virtual void WebContentsDestroyed() override;
 
   // Add the infobar to the WebContents, if it's still needed.
   void AddInfoBarToWebContents();
diff --git a/chrome/browser/ui/android/infobars/confirm_infobar.h b/chrome/browser/ui/android/infobars/confirm_infobar.h
index 9cab50c..6284d37 100644
--- a/chrome/browser/ui/android/infobars/confirm_infobar.h
+++ b/chrome/browser/ui/android/infobars/confirm_infobar.h
@@ -18,10 +18,10 @@ class ConfirmInfoBar : public InfoBarAndroid {
  protected:
   // InfoBarAndroid:
   virtual base::android::ScopedJavaLocalRef<jobject> CreateRenderInfoBar(
-      JNIEnv* env) OVERRIDE;
-  virtual void OnLinkClicked(JNIEnv* env, jobject obj) OVERRIDE;
+      JNIEnv* env) override;
+  virtual void OnLinkClicked(JNIEnv* env, jobject obj) override;
   virtual void ProcessButton(int action,
-                             const std::string& action_value) OVERRIDE;
+                             const std::string& action_value) override;
 
   base::string16 GetTextFor(ConfirmInfoBarDelegate::InfoBarButton button);
 
diff --git a/chrome/browser/ui/android/infobars/data_reduction_proxy_infobar.h b/chrome/browser/ui/android/infobars/data_reduction_proxy_infobar.h
index 229d28a..4658a03 100644
--- a/chrome/browser/ui/android/infobars/data_reduction_proxy_infobar.h
+++ b/chrome/browser/ui/android/infobars/data_reduction_proxy_infobar.h
@@ -27,7 +27,7 @@ class DataReductionProxyInfoBar : public ConfirmInfoBar {
  private:
   // ConfirmInfoBar:
   virtual base::android::ScopedJavaLocalRef<jobject> CreateRenderInfoBar(
-      JNIEnv* env) OVERRIDE;
+      JNIEnv* env) override;
 
   DataReductionProxyInfoBarDelegate* GetDelegate();
 
diff --git a/chrome/browser/ui/android/infobars/infobar_container_android.h b/chrome/browser/ui/android/infobars/infobar_container_android.h
index 4a9bfea..c0e5c4e 100644
--- a/chrome/browser/ui/android/infobars/infobar_container_android.h
+++ b/chrome/browser/ui/android/infobars/infobar_container_android.h
@@ -36,16 +36,16 @@ class InfoBarContainerAndroid : public infobars::InfoBarContainer {
   }
 
  private:
-  virtual ~InfoBarContainerAndroid() OVERRIDE;
+  virtual ~InfoBarContainerAndroid() override;
 
   // InfobarContainer:
   virtual void PlatformSpecificAddInfoBar(infobars::InfoBar* infobar,
-                                          size_t position) OVERRIDE;
+                                          size_t position) override;
   virtual void PlatformSpecificRemoveInfoBar(infobars::InfoBar* infobar)
-      OVERRIDE;
+      override;
   virtual void PlatformSpecificReplaceInfoBar(
       infobars::InfoBar* old_infobar,
-      infobars::InfoBar* new_infobar) OVERRIDE;
+      infobars::InfoBar* new_infobar) override;
 
   // Create the Java equivalent of |android_bar| and add it to the java
   // container.
diff --git a/chrome/browser/ui/android/infobars/save_password_infobar.h b/chrome/browser/ui/android/infobars/save_password_infobar.h
index 11c586b..c364569 100644
--- a/chrome/browser/ui/android/infobars/save_password_infobar.h
+++ b/chrome/browser/ui/android/infobars/save_password_infobar.h
@@ -24,7 +24,7 @@ class SavePasswordInfoBar : public ConfirmInfoBar {
  private:
   // ConfirmInfoBar:
   virtual base::android::ScopedJavaLocalRef<jobject> CreateRenderInfoBar(
-      JNIEnv* env) OVERRIDE;
+      JNIEnv* env) override;
 
   SavePasswordInfoBarDelegate* GetDelegate();
 
diff --git a/chrome/browser/ui/android/infobars/translate_infobar.h b/chrome/browser/ui/android/infobars/translate_infobar.h
index 9209e5e..f03148c 100644
--- a/chrome/browser/ui/android/infobars/translate_infobar.h
+++ b/chrome/browser/ui/android/infobars/translate_infobar.h
@@ -32,10 +32,10 @@ class TranslateInfoBar : public InfoBarAndroid {
  private:
   // InfoBarAndroid:
   virtual base::android::ScopedJavaLocalRef<jobject> CreateRenderInfoBar(
-      JNIEnv* env) OVERRIDE;
+      JNIEnv* env) override;
   virtual void ProcessButton(int action,
-                             const std::string& action_value) OVERRIDE;
-  virtual void PassJavaInfoBar(InfoBarAndroid* source) OVERRIDE;
+                             const std::string& action_value) override;
+  virtual void PassJavaInfoBar(InfoBarAndroid* source) override;
 
   void TransferOwnership(TranslateInfoBar* destination,
                          translate::TranslateStep new_type);
diff --git a/chrome/browser/ui/android/javascript_app_modal_dialog_android.h b/chrome/browser/ui/android/javascript_app_modal_dialog_android.h
index 583191b..5a731d1 100644
--- a/chrome/browser/ui/android/javascript_app_modal_dialog_android.h
+++ b/chrome/browser/ui/android/javascript_app_modal_dialog_android.h
@@ -19,12 +19,12 @@ class JavascriptAppModalDialogAndroid : public NativeAppModalDialog {
                                   gfx::NativeWindow parent);
 
   // NativeAppModalDialog:
-  virtual int GetAppModalDialogButtons() const OVERRIDE;
-  virtual void ShowAppModalDialog() OVERRIDE;
-  virtual void ActivateAppModalDialog() OVERRIDE;
-  virtual void CloseAppModalDialog() OVERRIDE;
-  virtual void AcceptAppModalDialog() OVERRIDE;
-  virtual void CancelAppModalDialog() OVERRIDE;
+  virtual int GetAppModalDialogButtons() const override;
+  virtual void ShowAppModalDialog() override;
+  virtual void ActivateAppModalDialog() override;
+  virtual void CloseAppModalDialog() override;
+  virtual void AcceptAppModalDialog() override;
+  virtual void CancelAppModalDialog() override;
 
   // Called when java confirms or cancels the dialog.
   void DidAcceptAppModalDialog(JNIEnv* env,
diff --git a/chrome/browser/ui/android/login_prompt_android.cc b/chrome/browser/ui/android/login_prompt_android.cc
index 88880f4..9f5058a 100644
--- a/chrome/browser/ui/android/login_prompt_android.cc
+++ b/chrome/browser/ui/android/login_prompt_android.cc
@@ -30,17 +30,17 @@ class LoginHandlerAndroid : public LoginHandler {
 
   virtual void OnAutofillDataAvailable(
       const base::string16& username,
-      const base::string16& password) OVERRIDE {
+      const base::string16& password) override {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     DCHECK(chrome_http_auth_handler_.get() != NULL);
     chrome_http_auth_handler_->OnAutofillDataAvailable(
         username, password);
   }
-  virtual void OnLoginModelDestroying() OVERRIDE {}
+  virtual void OnLoginModelDestroying() override {}
 
   virtual void BuildViewForPasswordManager(
       password_manager::PasswordManager* manager,
-      const base::string16& explanation) OVERRIDE {
+      const base::string16& explanation) override {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
     // Get pointer to TabAndroid
@@ -70,7 +70,7 @@ class LoginHandlerAndroid : public LoginHandler {
  protected:
   virtual ~LoginHandlerAndroid() {}
 
-  virtual void CloseDialog() OVERRIDE {}
+  virtual void CloseDialog() override {}
 
  private:
   scoped_ptr<ChromeHttpAuthHandler> chrome_http_auth_handler_;
diff --git a/chrome/browser/ui/android/tab_contents/chrome_web_contents_view_delegate_android.h b/chrome/browser/ui/android/tab_contents/chrome_web_contents_view_delegate_android.h
index c0cf81c..054ba11 100644
--- a/chrome/browser/ui/android/tab_contents/chrome_web_contents_view_delegate_android.h
+++ b/chrome/browser/ui/android/tab_contents/chrome_web_contents_view_delegate_android.h
@@ -25,10 +25,10 @@ class ChromeWebContentsViewDelegateAndroid
   // WebContentsViewDelegate:
   virtual void ShowContextMenu(
       content::RenderFrameHost* render_frame_host,
-      const content::ContextMenuParams& params) OVERRIDE;
+      const content::ContextMenuParams& params) override;
 
   // WebContentsViewDelegate:
-  virtual content::WebDragDestDelegate* GetDragDestDelegate() OVERRIDE;
+  virtual content::WebDragDestDelegate* GetDragDestDelegate() override;
 
  private:
   // The WebContents that owns the view and this delegate transitively.
diff --git a/chrome/browser/ui/android/tab_model/tab_model.h b/chrome/browser/ui/android/tab_model/tab_model.h
index 88bdc96..f9fd8ef 100644
--- a/chrome/browser/ui/android/tab_model/tab_model.h
+++ b/chrome/browser/ui/android/tab_model/tab_model.h
@@ -68,7 +68,7 @@ class TabModel : public content::NotificationObserver {
   // Determines how TabModel will interact with the profile.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // The profile associated with this TabModel.
   Profile* profile_;
diff --git a/chrome/browser/ui/android/tab_model/tab_model_base.h b/chrome/browser/ui/android/tab_model/tab_model_base.h
index 60b4c1e..b197293 100644
--- a/chrome/browser/ui/android/tab_model/tab_model_base.h
+++ b/chrome/browser/ui/android/tab_model/tab_model_base.h
@@ -35,21 +35,21 @@ class TabModelBase : public TabModel {
   void TabAddedToModel(JNIEnv* env, jobject obj, jobject jtab);
 
   // TabModel:
-  virtual int GetTabCount() const OVERRIDE;
-  virtual int GetActiveIndex() const OVERRIDE;
-  virtual content::WebContents* GetWebContentsAt(int index) const OVERRIDE;
-  virtual TabAndroid* GetTabAt(int index) const OVERRIDE;
+  virtual int GetTabCount() const override;
+  virtual int GetActiveIndex() const override;
+  virtual content::WebContents* GetWebContentsAt(int index) const override;
+  virtual TabAndroid* GetTabAt(int index) const override;
 
-  virtual void SetActiveIndex(int index) OVERRIDE;
-  virtual void CloseTabAt(int index) OVERRIDE;
+  virtual void SetActiveIndex(int index) override;
+  virtual void CloseTabAt(int index) override;
 
   virtual void CreateTab(content::WebContents* web_contents,
-                         int parent_tab_id) OVERRIDE;
+                         int parent_tab_id) override;
   virtual content::WebContents* CreateNewTabForDevTools(
-      const GURL& url) OVERRIDE;
+      const GURL& url) override;
 
   // Return true if we are currently restoring sessions asynchronously.
-  virtual bool IsSessionRestoreInProgress() const OVERRIDE;
+  virtual bool IsSessionRestoreInProgress() const override;
 
   // Instructs the TabModel to broadcast a notification that all tabs are now
   // loaded from storage.
diff --git a/chrome/browser/ui/android/tab_model/tab_model_unittest.cc b/chrome/browser/ui/android/tab_model/tab_model_unittest.cc
index 85808e8..9808857 100644
--- a/chrome/browser/ui/android/tab_model/tab_model_unittest.cc
+++ b/chrome/browser/ui/android/tab_model/tab_model_unittest.cc
@@ -29,23 +29,23 @@ class TestTabModel : public TabModel {
   explicit TestTabModel(Profile* profile)
     : TabModel(profile) {}
 
-  virtual int GetTabCount() const OVERRIDE { return 0; }
-  virtual int GetActiveIndex() const OVERRIDE { return 0; }
-  virtual content::WebContents* GetWebContentsAt(int index) const OVERRIDE {
+  virtual int GetTabCount() const override { return 0; }
+  virtual int GetActiveIndex() const override { return 0; }
+  virtual content::WebContents* GetWebContentsAt(int index) const override {
     return NULL;
   }
   virtual void CreateTab(content::WebContents* web_contents,
-                         int parent_tab_id) OVERRIDE {}
+                         int parent_tab_id) override {}
   virtual content::WebContents* CreateNewTabForDevTools(
-      const GURL& url) OVERRIDE {
+      const GURL& url) override {
     return NULL;
   }
-  virtual bool IsSessionRestoreInProgress() const OVERRIDE { return false; }
-  virtual TabAndroid* GetTabAt(int index) const OVERRIDE {
+  virtual bool IsSessionRestoreInProgress() const override { return false; }
+  virtual TabAndroid* GetTabAt(int index) const override {
     return NULL;
   }
-  virtual void SetActiveIndex(int index) OVERRIDE {}
-  virtual void CloseTabAt(int index) OVERRIDE {}
+  virtual void SetActiveIndex(int index) override {}
+  virtual void CloseTabAt(int index) override {}
 };
 
 TEST_F(TabModelTest, TestProfileHandling) {
diff --git a/chrome/browser/ui/android/toolbar/toolbar_model_android.h b/chrome/browser/ui/android/toolbar/toolbar_model_android.h
index 964a233..210f17e 100644
--- a/chrome/browser/ui/android/toolbar/toolbar_model_android.h
+++ b/chrome/browser/ui/android/toolbar/toolbar_model_android.h
@@ -35,8 +35,8 @@ class ToolbarModelAndroid : public ToolbarModelDelegate {
       jobject obj);
 
   // ToolbarDelegate:
-  virtual content::WebContents* GetActiveWebContents() const OVERRIDE;
-  virtual bool InTabbedBrowser() const OVERRIDE;
+  virtual content::WebContents* GetActiveWebContents() const override;
+  virtual bool InTabbedBrowser() const override;
 
   static bool RegisterToolbarModelAndroid(JNIEnv* env);
 
diff --git a/chrome/browser/ui/android/website_settings_popup_android.h b/chrome/browser/ui/android/website_settings_popup_android.h
index 75c4ea5..12cdafa 100644
--- a/chrome/browser/ui/android/website_settings_popup_android.h
+++ b/chrome/browser/ui/android/website_settings_popup_android.h
@@ -30,12 +30,12 @@ class WebsiteSettingsPopupAndroid : public WebsiteSettingsUI {
   void ResetCertDecisions(JNIEnv* env, jobject obj, jobject java_web_contents);
 
   // WebsiteSettingsUI implementations.
-  virtual void SetCookieInfo(const CookieInfoList& cookie_info_list) OVERRIDE;
+  virtual void SetCookieInfo(const CookieInfoList& cookie_info_list) override;
   virtual void SetPermissionInfo(
-      const PermissionInfoList& permission_info_list) OVERRIDE;
-  virtual void SetIdentityInfo(const IdentityInfo& identity_info) OVERRIDE;
-  virtual void SetFirstVisit(const base::string16& first_visit) OVERRIDE;
-  virtual void SetSelectedTab(WebsiteSettingsUI::TabId tab_id) OVERRIDE;
+      const PermissionInfoList& permission_info_list) override;
+  virtual void SetIdentityInfo(const IdentityInfo& identity_info) override;
+  virtual void SetFirstVisit(const base::string16& first_visit) override;
+  virtual void SetSelectedTab(WebsiteSettingsUI::TabId tab_id) override;
 
   static bool RegisterWebsiteSettingsPopupAndroid(JNIEnv* env);
 
diff --git a/chrome/browser/ui/app_list/app_context_menu.h b/chrome/browser/ui/app_list/app_context_menu.h
index 8c3c8f1..764dc7c 100644
--- a/chrome/browser/ui/app_list/app_context_menu.h
+++ b/chrome/browser/ui/app_list/app_context_menu.h
@@ -45,14 +45,14 @@ class AppContextMenu : public ui::SimpleMenuModel::Delegate {
 
  private:
   // ui::SimpleMenuModel::Delegate overrides:
-  virtual bool IsItemForCommandIdDynamic(int command_id) const OVERRIDE;
-  virtual base::string16 GetLabelForCommandId(int command_id) const OVERRIDE;
-  virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
-  virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
+  virtual bool IsItemForCommandIdDynamic(int command_id) const override;
+  virtual base::string16 GetLabelForCommandId(int command_id) const override;
+  virtual bool IsCommandIdChecked(int command_id) const override;
+  virtual bool IsCommandIdEnabled(int command_id) const override;
   virtual bool GetAcceleratorForCommandId(
       int command_id,
-      ui::Accelerator* acclelrator) OVERRIDE;
-  virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE;
+      ui::Accelerator* acclelrator) override;
+  virtual void ExecuteCommand(int command_id, int event_flags) override;
 
   AppContextMenuDelegate* delegate_;
   Profile* profile_;
diff --git a/chrome/browser/ui/app_list/app_list_controller_browsertest.cc b/chrome/browser/ui/app_list/app_list_controller_browsertest.cc
index abdd8cc..5a88185 100644
--- a/chrome/browser/ui/app_list/app_list_controller_browsertest.cc
+++ b/chrome/browser/ui/app_list/app_list_controller_browsertest.cc
@@ -90,25 +90,25 @@ class AppListControllerSearchResultsBrowserTest
   }
 
   // Overridden from SearchResultObserver:
-  virtual void OnIconChanged() OVERRIDE {}
-  virtual void OnActionsChanged() OVERRIDE {}
-  virtual void OnIsInstallingChanged() OVERRIDE {}
-  virtual void OnPercentDownloadedChanged() OVERRIDE {}
-  virtual void OnItemInstalled() OVERRIDE {}
-  virtual void OnItemUninstalled() OVERRIDE {
+  virtual void OnIconChanged() override {}
+  virtual void OnActionsChanged() override {}
+  virtual void OnIsInstallingChanged() override {}
+  virtual void OnPercentDownloadedChanged() override {}
+  virtual void OnItemInstalled() override {}
+  virtual void OnItemUninstalled() override {
     ++item_uninstall_count_;
     EXPECT_TRUE(observed_result_);
   }
 
   // Overridden from ui::ListModelObserver:
-  virtual void ListItemsAdded(size_t start, size_t count) OVERRIDE {
+  virtual void ListItemsAdded(size_t start, size_t count) override {
     AttemptToLocateItem();
   }
-  virtual void ListItemsRemoved(size_t start, size_t count) OVERRIDE {
+  virtual void ListItemsRemoved(size_t start, size_t count) override {
     AttemptToLocateItem();
   }
-  virtual void ListItemMoved(size_t index, size_t target_index) OVERRIDE {}
-  virtual void ListItemsChanged(size_t start, size_t count) OVERRIDE {}
+  virtual void ListItemMoved(size_t index, size_t target_index) override {}
+  virtual void ListItemsChanged(size_t start, size_t count) override {}
 
   app_list::SearchResult* observed_result_;
   int item_uninstall_count_;
diff --git a/chrome/browser/ui/app_list/app_list_controller_delegate_impl.h b/chrome/browser/ui/app_list/app_list_controller_delegate_impl.h
index 69ab305..c5eac2d 100644
--- a/chrome/browser/ui/app_list/app_list_controller_delegate_impl.h
+++ b/chrome/browser/ui/app_list/app_list_controller_delegate_impl.h
@@ -28,28 +28,28 @@ class AppListControllerDelegateImpl : public AppListControllerDelegate {
   virtual ~AppListControllerDelegateImpl();
 
   // AppListControllerDelegate overrides:
-  virtual void DismissView() OVERRIDE;
-  virtual gfx::NativeWindow GetAppListWindow() OVERRIDE;
-  virtual gfx::ImageSkia GetWindowIcon() OVERRIDE;
-  virtual bool IsAppPinned(const std::string& extension_id) OVERRIDE;
-  virtual void PinApp(const std::string& extension_id) OVERRIDE;
-  virtual void UnpinApp(const std::string& extension_id) OVERRIDE;
-  virtual Pinnable GetPinnable() OVERRIDE;
-  virtual bool CanDoCreateShortcutsFlow() OVERRIDE;
+  virtual void DismissView() override;
+  virtual gfx::NativeWindow GetAppListWindow() override;
+  virtual gfx::ImageSkia GetWindowIcon() override;
+  virtual bool IsAppPinned(const std::string& extension_id) override;
+  virtual void PinApp(const std::string& extension_id) override;
+  virtual void UnpinApp(const std::string& extension_id) override;
+  virtual Pinnable GetPinnable() override;
+  virtual bool CanDoCreateShortcutsFlow() override;
   virtual void DoCreateShortcutsFlow(Profile* profile,
-                                     const std::string& extension_id) OVERRIDE;
-  virtual void CreateNewWindow(Profile* profile, bool incognito) OVERRIDE;
+                                     const std::string& extension_id) override;
+  virtual void CreateNewWindow(Profile* profile, bool incognito) override;
   virtual void ActivateApp(Profile* profile,
                            const extensions::Extension* extension,
                            AppListSource source,
-                           int event_flags) OVERRIDE;
+                           int event_flags) override;
   virtual void LaunchApp(Profile* profile,
                          const extensions::Extension* extension,
                          AppListSource source,
-                         int event_flags) OVERRIDE;
+                         int event_flags) override;
   virtual void ShowForProfileByPath(
-      const base::FilePath& profile_path) OVERRIDE;
-  virtual bool ShouldShowUserIcon() OVERRIDE;
+      const base::FilePath& profile_path) override;
+  virtual bool ShouldShowUserIcon() override;
 
  protected:
   // Perform platform-specific adjustments of |params| before OpenApplication().
diff --git a/chrome/browser/ui/app_list/app_list_controller_delegate_views.h b/chrome/browser/ui/app_list/app_list_controller_delegate_views.h
index 815ea67..7685edb 100644
--- a/chrome/browser/ui/app_list/app_list_controller_delegate_views.h
+++ b/chrome/browser/ui/app_list/app_list_controller_delegate_views.h
@@ -17,11 +17,11 @@ class AppListControllerDelegateViews : public AppListControllerDelegateImpl {
   virtual ~AppListControllerDelegateViews();
 
   // AppListControllerDelegate overrides:
-  virtual gfx::Rect GetAppListBounds() OVERRIDE;
-  virtual void ViewClosing() OVERRIDE;
-  virtual void OnShowChildDialog() OVERRIDE;
-  virtual void OnCloseChildDialog() OVERRIDE;
-  virtual bool CanDoCreateShortcutsFlow() OVERRIDE;
+  virtual gfx::Rect GetAppListBounds() override;
+  virtual void ViewClosing() override;
+  virtual void OnShowChildDialog() override;
+  virtual void OnCloseChildDialog() override;
+  virtual bool CanDoCreateShortcutsFlow() override;
 
  private:
   AppListServiceViews* service_;  // Weak. Owns us.
diff --git a/chrome/browser/ui/app_list/app_list_positioner_unittest.cc b/chrome/browser/ui/app_list/app_list_positioner_unittest.cc
index 48e129d..50f7cde 100644
--- a/chrome/browser/ui/app_list/app_list_positioner_unittest.cc
+++ b/chrome/browser/ui/app_list/app_list_positioner_unittest.cc
@@ -46,7 +46,7 @@ class AppListPositionerUnitTest : public testing::Test {
         new AppListPositioner(display_, view_size, kMinDistanceFromEdge));
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     display_.set_bounds(gfx::Rect(0, 0, kScreenWidth, kScreenHeight));
     // Assume there is a menu bar at the top of the screen, as on Mac and Unity.
     // This is for cases where the work area does not fill the entire screen.
diff --git a/chrome/browser/ui/app_list/app_list_service_disabled.cc b/chrome/browser/ui/app_list/app_list_service_disabled.cc
index 1def820..e6bf0b2 100644
--- a/chrome/browser/ui/app_list/app_list_service_disabled.cc
+++ b/chrome/browser/ui/app_list/app_list_service_disabled.cc
@@ -21,33 +21,33 @@ class AppListServiceDisabled : public AppListService {
   AppListServiceDisabled() {}
 
   // AppListService overrides:
-  virtual void SetAppListNextPaintCallback(void (*callback)()) OVERRIDE {}
-  virtual void HandleFirstRun() OVERRIDE {}
-  virtual void Init(Profile* initial_profile) OVERRIDE {}
+  virtual void SetAppListNextPaintCallback(void (*callback)()) override {}
+  virtual void HandleFirstRun() override {}
+  virtual void Init(Profile* initial_profile) override {}
 
   virtual base::FilePath GetProfilePath(
-      const base::FilePath& user_data_dir) OVERRIDE {
+      const base::FilePath& user_data_dir) override {
     return base::FilePath();
   }
-  virtual void SetProfilePath(const base::FilePath& profile_path) OVERRIDE {}
+  virtual void SetProfilePath(const base::FilePath& profile_path) override {}
 
-  virtual void Show() OVERRIDE {}
-  virtual void CreateForProfile(Profile* profile) OVERRIDE {}
-  virtual void ShowForProfile(Profile* profile) OVERRIDE {}
-  virtual void AutoShowForProfile(Profile* profile) OVERRIDE {}
-  virtual void DismissAppList() OVERRIDE {}
+  virtual void Show() override {}
+  virtual void CreateForProfile(Profile* profile) override {}
+  virtual void ShowForProfile(Profile* profile) override {}
+  virtual void AutoShowForProfile(Profile* profile) override {}
+  virtual void DismissAppList() override {}
 
-  virtual Profile* GetCurrentAppListProfile() OVERRIDE { return NULL; }
-  virtual bool IsAppListVisible() const OVERRIDE { return false; }
+  virtual Profile* GetCurrentAppListProfile() override { return NULL; }
+  virtual bool IsAppListVisible() const override { return false; }
   virtual void EnableAppList(Profile* initial_profile,
-                             AppListEnableSource enable_source) OVERRIDE {}
-  virtual AppListControllerDelegate* GetControllerDelegate() OVERRIDE {
+                             AppListEnableSource enable_source) override {}
+  virtual AppListControllerDelegate* GetControllerDelegate() override {
     return NULL;
   }
 
-  virtual void CreateShortcut() OVERRIDE {}
+  virtual void CreateShortcut() override {}
 
-  virtual gfx::NativeWindow GetAppListWindow() OVERRIDE {
+  virtual gfx::NativeWindow GetAppListWindow() override {
     return NULL;
   }
 
diff --git a/chrome/browser/ui/app_list/app_list_service_impl.cc b/chrome/browser/ui/app_list/app_list_service_impl.cc
index 9bf20e0..00dcad6 100644
--- a/chrome/browser/ui/app_list/app_list_service_impl.cc
+++ b/chrome/browser/ui/app_list/app_list_service_impl.cc
@@ -86,13 +86,13 @@ class ProfileStoreImpl : public ProfileStore {
         weak_factory_(this) {
   }
 
-  virtual void AddProfileObserver(ProfileInfoCacheObserver* observer) OVERRIDE {
+  virtual void AddProfileObserver(ProfileInfoCacheObserver* observer) override {
     profile_manager_->GetProfileInfoCache().AddObserver(observer);
   }
 
   virtual void LoadProfileAsync(
       const base::FilePath& path,
-      base::Callback<void(Profile*)> callback) OVERRIDE {
+      base::Callback<void(Profile*)> callback) override {
     profile_manager_->CreateProfileAsync(
         path,
         base::Bind(&ProfileStoreImpl::OnProfileCreated,
@@ -122,16 +122,16 @@ class ProfileStoreImpl : public ProfileStore {
     }
   }
 
-  virtual Profile* GetProfileByPath(const base::FilePath& path) OVERRIDE {
+  virtual Profile* GetProfileByPath(const base::FilePath& path) override {
     return profile_manager_->GetProfileByPath(path);
   }
 
-  virtual base::FilePath GetUserDataDir() OVERRIDE {
+  virtual base::FilePath GetUserDataDir() override {
     return profile_manager_->user_data_dir();
   }
 
   virtual bool IsProfileSupervised(
-      const base::FilePath& profile_path) OVERRIDE {
+      const base::FilePath& profile_path) override {
     ProfileInfoCache& profile_info =
         g_browser_process->profile_manager()->GetProfileInfoCache();
     size_t profile_index = profile_info.GetIndexOfProfileWithPath(profile_path);
diff --git a/chrome/browser/ui/app_list/app_list_service_impl.h b/chrome/browser/ui/app_list/app_list_service_impl.h
index 5ab4991..91c39e7 100644
--- a/chrome/browser/ui/app_list/app_list_service_impl.h
+++ b/chrome/browser/ui/app_list/app_list_service_impl.h
@@ -47,17 +47,17 @@ class AppListServiceImpl : public AppListService,
   static void RecordAppListAppLaunch();
 
   // AppListService overrides:
-  virtual void SetAppListNextPaintCallback(void (*callback)()) OVERRIDE;
-  virtual void HandleFirstRun() OVERRIDE;
-  virtual void Init(Profile* initial_profile) OVERRIDE;
+  virtual void SetAppListNextPaintCallback(void (*callback)()) override;
+  virtual void HandleFirstRun() override;
+  virtual void Init(Profile* initial_profile) override;
   virtual base::FilePath GetProfilePath(
-      const base::FilePath& user_data_dir) OVERRIDE;
-  virtual void SetProfilePath(const base::FilePath& profile_path) OVERRIDE;
-  virtual void Show() OVERRIDE;
-  virtual void AutoShowForProfile(Profile* requested_profile) OVERRIDE;
+      const base::FilePath& user_data_dir) override;
+  virtual void SetProfilePath(const base::FilePath& profile_path) override;
+  virtual void Show() override;
+  virtual void AutoShowForProfile(Profile* requested_profile) override;
   virtual void EnableAppList(Profile* initial_profile,
-                             AppListEnableSource enable_source) OVERRIDE;
-  virtual void CreateShortcut() OVERRIDE;
+                             AppListEnableSource enable_source) override;
+  virtual void CreateShortcut() override;
 
  protected:
   AppListServiceImpl();
@@ -89,7 +89,7 @@ class AppListServiceImpl : public AppListService,
 
   // ProfileInfoCacheObserver overrides:
   virtual void OnProfileWillBeRemoved(
-      const base::FilePath& profile_path) OVERRIDE;
+      const base::FilePath& profile_path) override;
 
   scoped_ptr<ProfileStore> profile_store_;
   base::CommandLine command_line_;
diff --git a/chrome/browser/ui/app_list/app_list_service_impl_browsertest.cc b/chrome/browser/ui/app_list/app_list_service_impl_browsertest.cc
index 10b4810..7ed765b 100644
--- a/chrome/browser/ui/app_list/app_list_service_impl_browsertest.cc
+++ b/chrome/browser/ui/app_list/app_list_service_impl_browsertest.cc
@@ -38,7 +38,7 @@ class AppListServiceImplBrowserTest : public InProcessBrowserTest {
   AppListServiceImplBrowserTest() {}
 
   // Overridden from InProcessBrowserTest:
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     service_ = test::GetAppListServiceImpl();
     test_api_.reset(new test::AppListServiceImplTestApi(service_));
   }
diff --git a/chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc b/chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc
index 85039dd..686fcfa 100644
--- a/chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc
+++ b/chrome/browser/ui/app_list/app_list_service_interactive_uitest.cc
@@ -145,7 +145,7 @@ class ShowAppListInteractiveTest : public InProcessBrowserTest {
  public:
   ShowAppListInteractiveTest() {}
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     command_line->AppendSwitch(switches::kShowAppList);
   }
 
@@ -197,7 +197,7 @@ class ShowAppListNonDefaultInteractiveTest : public ShowAppListInteractiveTest {
       : second_profile_name_(FILE_PATH_LITERAL("Profile 1")) {
   }
 
-  virtual bool SetUpUserDataDirectory() OVERRIDE {
+  virtual bool SetUpUserDataDirectory() override {
     // Create a temp dir for "Profile 1" and seed the user data dir with a Local
     // State file configuring the app list to use it.
     base::FilePath user_data_dir;
diff --git a/chrome/browser/ui/app_list/app_list_service_mac.h b/chrome/browser/ui/app_list/app_list_service_mac.h
index 81f80a75..e9c1a30 100644
--- a/chrome/browser/ui/app_list/app_list_service_mac.h
+++ b/chrome/browser/ui/app_list/app_list_service_mac.h
@@ -56,32 +56,32 @@ class AppListServiceMac : public AppListServiceImpl,
   void WindowAnimationDidEnd();
 
   // AppListService overrides:
-  virtual void Init(Profile* initial_profile) OVERRIDE;
-  virtual void CreateForProfile(Profile* requested_profile) OVERRIDE;
-  virtual void ShowForProfile(Profile* requested_profile) OVERRIDE;
-  virtual void DismissAppList() OVERRIDE;
-  virtual bool IsAppListVisible() const OVERRIDE;
+  virtual void Init(Profile* initial_profile) override;
+  virtual void CreateForProfile(Profile* requested_profile) override;
+  virtual void ShowForProfile(Profile* requested_profile) override;
+  virtual void DismissAppList() override;
+  virtual bool IsAppListVisible() const override;
   virtual void EnableAppList(Profile* initial_profile,
-                             AppListEnableSource enable_source) OVERRIDE;
-  virtual gfx::NativeWindow GetAppListWindow() OVERRIDE;
-  virtual AppListControllerDelegate* GetControllerDelegate() OVERRIDE;
-  virtual Profile* GetCurrentAppListProfile() OVERRIDE;
-  virtual void CreateShortcut() OVERRIDE;
+                             AppListEnableSource enable_source) override;
+  virtual gfx::NativeWindow GetAppListWindow() override;
+  virtual AppListControllerDelegate* GetControllerDelegate() override;
+  virtual Profile* GetCurrentAppListProfile() override;
+  virtual void CreateShortcut() override;
 
   // AppListServiceImpl overrides:
-  virtual void DestroyAppList() OVERRIDE;
+  virtual void DestroyAppList() override;
 
   // AppShimHandler overrides:
   virtual void OnShimLaunch(apps::AppShimHandler::Host* host,
                             apps::AppShimLaunchType launch_type,
-                            const std::vector<base::FilePath>& files) OVERRIDE;
-  virtual void OnShimClose(apps::AppShimHandler::Host* host) OVERRIDE;
+                            const std::vector<base::FilePath>& files) override;
+  virtual void OnShimClose(apps::AppShimHandler::Host* host) override;
   virtual void OnShimFocus(apps::AppShimHandler::Host* host,
                            apps::AppShimFocusType focus_type,
-                           const std::vector<base::FilePath>& files) OVERRIDE;
+                           const std::vector<base::FilePath>& files) override;
   virtual void OnShimSetHidden(apps::AppShimHandler::Host* host,
-                               bool hidden) OVERRIDE;
-  virtual void OnShimQuit(apps::AppShimHandler::Host* host) OVERRIDE;
+                               bool hidden) override;
+  virtual void OnShimQuit(apps::AppShimHandler::Host* host) override;
 
  private:
   friend class test::AppListServiceMacTestApi;
diff --git a/chrome/browser/ui/app_list/app_list_service_mac_interactive_uitest.mm b/chrome/browser/ui/app_list/app_list_service_mac_interactive_uitest.mm
index 4cbada1..d3f8c52 100644
--- a/chrome/browser/ui/app_list/app_list_service_mac_interactive_uitest.mm
+++ b/chrome/browser/ui/app_list/app_list_service_mac_interactive_uitest.mm
@@ -50,7 +50,7 @@ class AppListServiceMacInteractiveTest : public InProcessBrowserTest,
   }
 
   // testing::Test overrides:
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // At tear-down, NOTIFICATION_APP_TERMINATING should have been sent for the
     // browser shutdown. References to browser-owned objects must be removed
     // from the app list UI.
@@ -62,23 +62,23 @@ class AppListServiceMacInteractiveTest : public InProcessBrowserTest,
   }
 
   // AppShimHandler::Host overrides:
-  virtual void OnAppLaunchComplete(apps::AppShimLaunchResult result) OVERRIDE {
+  virtual void OnAppLaunchComplete(apps::AppShimLaunchResult result) override {
     // AppList shims are always given APP_SHIM_LAUNCH_DUPLICATE_HOST, indicating
     // that the shim process should immediately close.
     EXPECT_EQ(apps::APP_SHIM_LAUNCH_DUPLICATE_HOST, result);
     ++launch_count_;
   }
-  virtual void OnAppClosed() OVERRIDE {
+  virtual void OnAppClosed() override {
     NOTREACHED();
   }
-  virtual void OnAppHide() OVERRIDE {}
+  virtual void OnAppHide() override {}
   virtual void OnAppRequestUserAttention(
-      apps::AppShimAttentionType type) OVERRIDE {}
-  virtual base::FilePath GetProfilePath() const OVERRIDE {
+      apps::AppShimAttentionType type) override {}
+  virtual base::FilePath GetProfilePath() const override {
     NOTREACHED();  // Currently unused in this test.
     return base::FilePath();
   }
-  virtual std::string GetAppId() const OVERRIDE {
+  virtual std::string GetAppId() const override {
     return app_mode::kAppListModeId;
   }
 
diff --git a/chrome/browser/ui/app_list/app_list_service_mac_unittest.mm b/chrome/browser/ui/app_list/app_list_service_mac_unittest.mm
index 8584757..2963db8 100644
--- a/chrome/browser/ui/app_list/app_list_service_mac_unittest.mm
+++ b/chrome/browser/ui/app_list/app_list_service_mac_unittest.mm
@@ -65,7 +65,7 @@ NSPoint OffsetPoint(const NSPoint& point, CGFloat x_offset, CGFloat y_offset) {
 
 class AppListServiceMacUnitTest : public testing::Test {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     display_.set_bounds(gfx::Rect(0, 0, kScreenWidth, kScreenHeight));
     display_.set_work_area(
         gfx::Rect(0, kMenuBarSize, kScreenWidth, kScreenHeight - kMenuBarSize));
diff --git a/chrome/browser/ui/app_list/app_list_service_unittest.cc b/chrome/browser/ui/app_list/app_list_service_unittest.cc
index f6d80a6..251b3ac 100644
--- a/chrome/browser/ui/app_list/app_list_service_unittest.cc
+++ b/chrome/browser/ui/app_list/app_list_service_unittest.cc
@@ -42,38 +42,38 @@ class TestingAppListServiceImpl : public AppListServiceImpl {
   }
 
   // AppListService overrides:
-  virtual Profile* GetCurrentAppListProfile() OVERRIDE {
+  virtual Profile* GetCurrentAppListProfile() override {
     // We don't return showing_for_profile_ here because that is only defined if
     // the app list is visible.
     return NULL;
   }
 
-  virtual void CreateForProfile(Profile* requested_profile) OVERRIDE {
+  virtual void CreateForProfile(Profile* requested_profile) override {
   }
 
-  virtual void ShowForProfile(Profile* requested_profile) OVERRIDE {
+  virtual void ShowForProfile(Profile* requested_profile) override {
     showing_for_profile_ = requested_profile;
     RecordAppListLaunch();
   }
 
-  virtual void DismissAppList() OVERRIDE {
+  virtual void DismissAppList() override {
     showing_for_profile_ = NULL;
   }
 
-  virtual bool IsAppListVisible() const OVERRIDE {
+  virtual bool IsAppListVisible() const override {
     return !!showing_for_profile_;
   }
 
-  virtual gfx::NativeWindow GetAppListWindow() OVERRIDE {
+  virtual gfx::NativeWindow GetAppListWindow() override {
     return NULL;
   }
 
-  virtual AppListControllerDelegate* GetControllerDelegate() OVERRIDE {
+  virtual AppListControllerDelegate* GetControllerDelegate() override {
     return NULL;
   }
 
   // AppListServiceImpl overrides:
-  virtual void DestroyAppList() OVERRIDE { ++destroy_app_list_call_count_; }
+  virtual void DestroyAppList() override { ++destroy_app_list_call_count_; }
 
  private:
   Profile* showing_for_profile_;
@@ -86,7 +86,7 @@ class AppListServiceUnitTest : public testing::Test {
  public:
   AppListServiceUnitTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     SetupWithCommandLine(CommandLine(CommandLine::NO_PROGRAM));
   }
 
diff --git a/chrome/browser/ui/app_list/app_list_service_views.h b/chrome/browser/ui/app_list/app_list_service_views.h
index 14fc0cf..aeecd8e 100644
--- a/chrome/browser/ui/app_list/app_list_service_views.h
+++ b/chrome/browser/ui/app_list/app_list_service_views.h
@@ -31,20 +31,20 @@ class AppListServiceViews : public AppListServiceImpl,
   virtual void OnViewBeingDestroyed();
 
   // AppListService overrides:
-  virtual void Init(Profile* initial_profile) OVERRIDE;
-  virtual void CreateForProfile(Profile* requested_profile) OVERRIDE;
-  virtual void ShowForProfile(Profile* requested_profile) OVERRIDE;
-  virtual void DismissAppList() OVERRIDE;
-  virtual bool IsAppListVisible() const OVERRIDE;
-  virtual gfx::NativeWindow GetAppListWindow() OVERRIDE;
-  virtual Profile* GetCurrentAppListProfile() OVERRIDE;
-  virtual AppListControllerDelegate* GetControllerDelegate() OVERRIDE;
+  virtual void Init(Profile* initial_profile) override;
+  virtual void CreateForProfile(Profile* requested_profile) override;
+  virtual void ShowForProfile(Profile* requested_profile) override;
+  virtual void DismissAppList() override;
+  virtual bool IsAppListVisible() const override;
+  virtual gfx::NativeWindow GetAppListWindow() override;
+  virtual Profile* GetCurrentAppListProfile() override;
+  virtual AppListControllerDelegate* GetControllerDelegate() override;
 
   // AppListServiceImpl overrides:
-  virtual void DestroyAppList() OVERRIDE;
+  virtual void DestroyAppList() override;
 
   // AppListShowerDelegate overrides:
-  virtual AppListViewDelegate* GetViewDelegateForCreate() OVERRIDE;
+  virtual AppListViewDelegate* GetViewDelegateForCreate() override;
 
  private:
   // Responsible for creating the app list and responding to profile changes.
diff --git a/chrome/browser/ui/app_list/app_list_shower_views_unittest.cc b/chrome/browser/ui/app_list/app_list_shower_views_unittest.cc
index 6ae22ae..8360507 100644
--- a/chrome/browser/ui/app_list/app_list_shower_views_unittest.cc
+++ b/chrome/browser/ui/app_list/app_list_shower_views_unittest.cc
@@ -19,30 +19,30 @@ class FakeAppListShower : public AppListShower {
       : AppListShower(delegate), has_view_(false), visible_(false) {}
 
   // AppListShower:
-  virtual void HandleViewBeingDestroyed() OVERRIDE {
+  virtual void HandleViewBeingDestroyed() override {
     AppListShower::HandleViewBeingDestroyed();
     has_view_ = false;
     visible_ = false;
   }
 
-  virtual bool IsAppListVisible() const OVERRIDE { return visible_; }
+  virtual bool IsAppListVisible() const override { return visible_; }
 
-  virtual app_list::AppListView* MakeViewForCurrentProfile() OVERRIDE {
+  virtual app_list::AppListView* MakeViewForCurrentProfile() override {
     has_view_ = true;
     return NULL;
   }
 
-  virtual void UpdateViewForNewProfile() OVERRIDE {}
+  virtual void UpdateViewForNewProfile() override {}
 
-  virtual void Show() OVERRIDE {
+  virtual void Show() override {
     visible_ = true;
   }
 
-  virtual void Hide() OVERRIDE {
+  virtual void Hide() override {
     visible_ = false;
   }
 
-  virtual bool HasView() const OVERRIDE {
+  virtual bool HasView() const override {
     return has_view_;
   }
 
@@ -62,13 +62,13 @@ class AppListShowerUnitTest : public testing::Test,
       : views_created_(0),
         views_dismissed_(0) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     shower_.reset(new FakeAppListShower(this));
     profile1_ = CreateProfile("p1").Pass();
     profile2_ = CreateProfile("p2").Pass();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
   }
 
   scoped_ptr<FakeProfile> CreateProfile(const std::string& name) {
@@ -76,7 +76,7 @@ class AppListShowerUnitTest : public testing::Test,
   }
 
   // AppListShowerDelegate:
-  virtual AppListViewDelegate* GetViewDelegateForCreate() OVERRIDE {
+  virtual AppListViewDelegate* GetViewDelegateForCreate() override {
     return NULL;
   }
 
@@ -84,9 +84,9 @@ class AppListShowerUnitTest : public testing::Test,
     return shower_->keep_alive_.get() != NULL;
   }
 
-  virtual void OnViewCreated() OVERRIDE { ++views_created_; }
-  virtual void OnViewDismissed() OVERRIDE { ++views_dismissed_; }
-  virtual void MoveNearCursor(app_list::AppListView* view) OVERRIDE {}
+  virtual void OnViewCreated() override { ++views_created_; }
+  virtual void OnViewDismissed() override { ++views_dismissed_; }
+  virtual void MoveNearCursor(app_list::AppListView* view) override {}
 
  protected:
   scoped_ptr<FakeAppListShower> shower_;
diff --git a/chrome/browser/ui/app_list/app_list_syncable_service.cc b/chrome/browser/ui/app_list/app_list_syncable_service.cc
index 8f96689..a2e9334 100644
--- a/chrome/browser/ui/app_list/app_list_syncable_service.cc
+++ b/chrome/browser/ui/app_list/app_list_syncable_service.cc
@@ -174,7 +174,7 @@ class AppListSyncableService::ModelObserver : public AppListModelObserver {
 
  private:
   // AppListModelObserver
-  virtual void OnAppListItemAdded(AppListItem* item) OVERRIDE {
+  virtual void OnAppListItemAdded(AppListItem* item) override {
     DCHECK(!adding_item_);
     adding_item_ = item;  // Ignore updates while adding an item.
     VLOG(2) << owner_ << " OnAppListItemAdded: " << item->ToDebugString();
@@ -182,7 +182,7 @@ class AppListSyncableService::ModelObserver : public AppListModelObserver {
     adding_item_ = NULL;
   }
 
-  virtual void OnAppListItemWillBeDeleted(AppListItem* item) OVERRIDE {
+  virtual void OnAppListItemWillBeDeleted(AppListItem* item) override {
     DCHECK(!adding_item_);
     VLOG(2) << owner_ << " OnAppListItemDeleted: " << item->ToDebugString();
     // Don't sync folder removal in case the folder still exists on another
@@ -193,7 +193,7 @@ class AppListSyncableService::ModelObserver : public AppListModelObserver {
     owner_->RemoveSyncItem(item->id());
   }
 
-  virtual void OnAppListItemUpdated(AppListItem* item) OVERRIDE {
+  virtual void OnAppListItemUpdated(AppListItem* item) override {
     if (adding_item_) {
       // Adding an item may trigger update notifications which should be
       // ignored.
diff --git a/chrome/browser/ui/app_list/app_list_syncable_service.h b/chrome/browser/ui/app_list/app_list_syncable_service.h
index d1ecd7c..76a0e7b 100644
--- a/chrome/browser/ui/app_list/app_list_syncable_service.h
+++ b/chrome/browser/ui/app_list/app_list_syncable_service.h
@@ -92,25 +92,25 @@ class AppListSyncableService : public syncer::SyncableService,
       syncer::ModelType type,
       const syncer::SyncDataList& initial_sync_data,
       scoped_ptr<syncer::SyncChangeProcessor> sync_processor,
-      scoped_ptr<syncer::SyncErrorFactory> error_handler) OVERRIDE;
-  virtual void StopSyncing(syncer::ModelType type) OVERRIDE;
+      scoped_ptr<syncer::SyncErrorFactory> error_handler) override;
+  virtual void StopSyncing(syncer::ModelType type) override;
   virtual syncer::SyncDataList GetAllSyncData(
-      syncer::ModelType type) const OVERRIDE;
+      syncer::ModelType type) const override;
   virtual syncer::SyncError ProcessSyncChanges(
       const tracked_objects::Location& from_here,
-      const syncer::SyncChangeList& change_list) OVERRIDE;
+      const syncer::SyncChangeList& change_list) override;
 
  private:
   class ModelObserver;
   typedef std::map<std::string, SyncItem*> SyncItemMap;
 
   // KeyedService
-  virtual void Shutdown() OVERRIDE;
+  virtual void Shutdown() override;
 
   // content::NotificationObserver
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // Builds the model once ExtensionService is ready.
   void BuildModel();
diff --git a/chrome/browser/ui/app_list/app_list_syncable_service_factory.h b/chrome/browser/ui/app_list/app_list_syncable_service_factory.h
index 5781745..d8de0ca 100644
--- a/chrome/browser/ui/app_list/app_list_syncable_service_factory.h
+++ b/chrome/browser/ui/app_list/app_list_syncable_service_factory.h
@@ -35,13 +35,13 @@ class AppListSyncableServiceFactory : public BrowserContextKeyedServiceFactory {
 
   // BrowserContextKeyedServiceFactory:
   virtual KeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* profile) const OVERRIDE;
+      content::BrowserContext* profile) const override;
   virtual void RegisterProfilePrefs(
-      user_prefs::PrefRegistrySyncable* registry) OVERRIDE;
+      user_prefs::PrefRegistrySyncable* registry) override;
   virtual content::BrowserContext* GetBrowserContextToUse(
-      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;
 
   DISALLOW_COPY_AND_ASSIGN(AppListSyncableServiceFactory);
 };
diff --git a/chrome/browser/ui/app_list/app_list_test_util.h b/chrome/browser/ui/app_list/app_list_test_util.h
index 3004e77..44b6d2e 100644
--- a/chrome/browser/ui/app_list/app_list_test_util.h
+++ b/chrome/browser/ui/app_list/app_list_test_util.h
@@ -17,7 +17,7 @@ class AppListTestBase : public extensions::ExtensionServiceTestBase {
   AppListTestBase();
   virtual ~AppListTestBase();
 
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 };
 
 #endif  // CHROME_BROWSER_UI_APP_LIST_APP_LIST_TEST_UTIL_H_
diff --git a/chrome/browser/ui/app_list/app_list_view_delegate.h b/chrome/browser/ui/app_list/app_list_view_delegate.h
index 8f8c805..06d8218 100644
--- a/chrome/browser/ui/app_list/app_list_view_delegate.h
+++ b/chrome/browser/ui/app_list/app_list_view_delegate.h
@@ -75,81 +75,81 @@ class AppListViewDelegate : public app_list::AppListViewDelegate,
   void SetUpCustomLauncherPages();
 
   // Overridden from app_list::AppListViewDelegate:
-  virtual bool ForceNativeDesktop() const OVERRIDE;
-  virtual void SetProfileByPath(const base::FilePath& profile_path) OVERRIDE;
-  virtual app_list::AppListModel* GetModel() OVERRIDE;
-  virtual app_list::SpeechUIModel* GetSpeechUI() OVERRIDE;
+  virtual bool ForceNativeDesktop() const override;
+  virtual void SetProfileByPath(const base::FilePath& profile_path) override;
+  virtual app_list::AppListModel* GetModel() override;
+  virtual app_list::SpeechUIModel* GetSpeechUI() override;
   virtual void GetShortcutPathForApp(
       const std::string& app_id,
-      const base::Callback<void(const base::FilePath&)>& callback) OVERRIDE;
-  virtual void StartSearch() OVERRIDE;
-  virtual void StopSearch() OVERRIDE;
+      const base::Callback<void(const base::FilePath&)>& callback) override;
+  virtual void StartSearch() override;
+  virtual void StopSearch() override;
   virtual void OpenSearchResult(app_list::SearchResult* result,
                                 bool auto_launch,
-                                int event_flags) OVERRIDE;
+                                int event_flags) override;
   virtual void InvokeSearchResultAction(app_list::SearchResult* result,
                                         int action_index,
-                                        int event_flags) OVERRIDE;
-  virtual base::TimeDelta GetAutoLaunchTimeout() OVERRIDE;
-  virtual void AutoLaunchCanceled() OVERRIDE;
-  virtual void ViewInitialized() OVERRIDE;
-  virtual void Dismiss() OVERRIDE;
-  virtual void ViewClosing() OVERRIDE;
-  virtual gfx::ImageSkia GetWindowIcon() OVERRIDE;
-  virtual void OpenSettings() OVERRIDE;
-  virtual void OpenHelp() OVERRIDE;
-  virtual void OpenFeedback() OVERRIDE;
-  virtual void ToggleSpeechRecognition() OVERRIDE;
+                                        int event_flags) override;
+  virtual base::TimeDelta GetAutoLaunchTimeout() override;
+  virtual void AutoLaunchCanceled() override;
+  virtual void ViewInitialized() override;
+  virtual void Dismiss() override;
+  virtual void ViewClosing() override;
+  virtual gfx::ImageSkia GetWindowIcon() override;
+  virtual void OpenSettings() override;
+  virtual void OpenHelp() override;
+  virtual void OpenFeedback() override;
+  virtual void ToggleSpeechRecognition() override;
   virtual void ShowForProfileByPath(
-      const base::FilePath& profile_path) OVERRIDE;
+      const base::FilePath& profile_path) override;
 #if defined(TOOLKIT_VIEWS)
-  virtual views::View* CreateStartPageWebView(const gfx::Size& size) OVERRIDE;
+  virtual views::View* CreateStartPageWebView(const gfx::Size& size) override;
   virtual std::vector<views::View*> CreateCustomPageWebViews(
-      const gfx::Size& size) OVERRIDE;
+      const gfx::Size& size) override;
 #endif
-  virtual bool IsSpeechRecognitionEnabled() OVERRIDE;
-  virtual const Users& GetUsers() const OVERRIDE;
-  virtual bool ShouldCenterWindow() const OVERRIDE;
+  virtual bool IsSpeechRecognitionEnabled() override;
+  virtual const Users& GetUsers() const override;
+  virtual bool ShouldCenterWindow() const override;
   virtual void AddObserver(
-      app_list::AppListViewDelegateObserver* observer) OVERRIDE;
+      app_list::AppListViewDelegateObserver* observer) override;
   virtual void RemoveObserver(
-      app_list::AppListViewDelegateObserver* observer) OVERRIDE;
+      app_list::AppListViewDelegateObserver* observer) override;
 
   // Overridden from app_list::StartPageObserver:
   virtual void OnSpeechResult(const base::string16& result,
-                              bool is_final) OVERRIDE;
-  virtual void OnSpeechSoundLevelChanged(int16 level) OVERRIDE;
+                              bool is_final) override;
+  virtual void OnSpeechSoundLevelChanged(int16 level) override;
   virtual void OnSpeechRecognitionStateChanged(
-      app_list::SpeechRecognitionState new_state) OVERRIDE;
+      app_list::SpeechRecognitionState new_state) override;
 
   // Overridden from HotwordClient:
-  virtual void OnHotwordStateChanged(bool started) OVERRIDE;
-  virtual void OnHotwordRecognized() OVERRIDE;
+  virtual void OnHotwordStateChanged(bool started) override;
+  virtual void OnHotwordRecognized() override;
 
   // Overridden from SigninManagerFactory::Observer:
-  virtual void SigninManagerCreated(SigninManagerBase* manager) OVERRIDE;
-  virtual void SigninManagerShutdown(SigninManagerBase* manager) OVERRIDE;
+  virtual void SigninManagerCreated(SigninManagerBase* manager) override;
+  virtual void SigninManagerShutdown(SigninManagerBase* manager) override;
 
   // Overridden from SigninManagerBase::Observer:
-  virtual void GoogleSigninFailed(const GoogleServiceAuthError& error) OVERRIDE;
+  virtual void GoogleSigninFailed(const GoogleServiceAuthError& error) override;
   virtual void GoogleSigninSucceeded(const std::string& account_id,
                                      const std::string& username,
-                                     const std::string& password) OVERRIDE;
+                                     const std::string& password) override;
   virtual void GoogleSignedOut(const std::string& account_id,
-                               const std::string& username) OVERRIDE;
+                               const std::string& username) override;
 
   // Overridden from ProfileInfoCacheObserver:
-  virtual void OnProfileAdded(const base::FilePath& profile_path) OVERRIDE;
+  virtual void OnProfileAdded(const base::FilePath& profile_path) override;
   virtual void OnProfileWasRemoved(const base::FilePath& profile_path,
-                                   const base::string16& profile_name) OVERRIDE;
+                                   const base::string16& profile_name) override;
   virtual void OnProfileNameChanged(
       const base::FilePath& profile_path,
-      const base::string16& old_profile_name) OVERRIDE;
+      const base::string16& old_profile_name) override;
 
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // Unowned pointer to the controller.
   AppListControllerDelegate* controller_;
diff --git a/chrome/browser/ui/app_list/extension_app_item.cc b/chrome/browser/ui/app_list/extension_app_item.cc
index 3f33b83..e5418d7 100644
--- a/chrome/browser/ui/app_list/extension_app_item.cc
+++ b/chrome/browser/ui/app_list/extension_app_item.cc
@@ -48,7 +48,7 @@ class ShortcutOverlayImageSource : public gfx::CanvasImageSource {
 
  private:
   // gfx::CanvasImageSource overrides:
-  virtual void Draw(gfx::Canvas* canvas) OVERRIDE {
+  virtual void Draw(gfx::Canvas* canvas) override {
     canvas->DrawImageInt(icon_, 0, 0);
 
     // Draw the overlay in the bottom left corner of the icon.
@@ -73,7 +73,7 @@ class RoundedCornersImageSource : public gfx::CanvasImageSource {
 
  private:
   // gfx::CanvasImageSource overrides:
-  virtual void Draw(gfx::Canvas* canvas) OVERRIDE {
+  virtual void Draw(gfx::Canvas* canvas) override {
     // The radius used to round the app icon.
     const size_t kRoundingRadius = 2;
 
diff --git a/chrome/browser/ui/app_list/extension_app_item.h b/chrome/browser/ui/app_list/extension_app_item.h
index 4ac0719..665ead1 100644
--- a/chrome/browser/ui/app_list/extension_app_item.h
+++ b/chrome/browser/ui/app_list/extension_app_item.h
@@ -80,21 +80,21 @@ class ExtensionAppItem : public app_list::AppListItem,
 
   // Overridden from extensions::IconImage::Observer:
   virtual void OnExtensionIconImageChanged(
-      extensions::IconImage* image) OVERRIDE;
+      extensions::IconImage* image) override;
 
   // Overridden from ExtensionEnableFlowDelegate:
-  virtual void ExtensionEnableFlowFinished() OVERRIDE;
-  virtual void ExtensionEnableFlowAborted(bool user_initiated) OVERRIDE;
+  virtual void ExtensionEnableFlowFinished() override;
+  virtual void ExtensionEnableFlowAborted(bool user_initiated) override;
 
   // Overridden from AppListItem:
-  virtual void Activate(int event_flags) OVERRIDE;
-  virtual ui::MenuModel* GetContextMenuModel() OVERRIDE;
+  virtual void Activate(int event_flags) override;
+  virtual ui::MenuModel* GetContextMenuModel() override;
   // Updates the icon if the overlay needs to be added/removed.
-  virtual void OnExtensionPreferenceChanged() OVERRIDE;
-  virtual const char* GetItemType() const OVERRIDE;
+  virtual void OnExtensionPreferenceChanged() override;
+  virtual const char* GetItemType() const override;
 
   // Overridden from app_list::AppContextMenuDelegate:
-  virtual void ExecuteLaunchCommand(int event_flags) OVERRIDE;
+  virtual void ExecuteLaunchCommand(int event_flags) override;
 
   // Set the position from the extension ordering.
   void UpdatePositionFromExtensionOrdering();
diff --git a/chrome/browser/ui/app_list/extension_app_model_builder.h b/chrome/browser/ui/app_list/extension_app_model_builder.h
index ce3528d..6dea347 100644
--- a/chrome/browser/ui/app_list/extension_app_model_builder.h
+++ b/chrome/browser/ui/app_list/extension_app_model_builder.h
@@ -59,34 +59,34 @@ class ExtensionAppModelBuilder : public extensions::InstallObserver,
 
   // extensions::InstallObserver.
   virtual void OnBeginExtensionInstall(
-      const ExtensionInstallParams& params) OVERRIDE;
+      const ExtensionInstallParams& params) override;
   virtual void OnDownloadProgress(const std::string& extension_id,
-                                  int percent_downloaded) OVERRIDE;
-  virtual void OnInstallFailure(const std::string& extension_id) OVERRIDE;
+                                  int percent_downloaded) override;
+  virtual void OnInstallFailure(const std::string& extension_id) override;
   virtual void OnDisabledExtensionUpdated(
-      const extensions::Extension* extension) OVERRIDE;
+      const extensions::Extension* extension) override;
   virtual void OnAppInstalledToAppList(
-      const std::string& extension_id) OVERRIDE;
-  virtual void OnShutdown() OVERRIDE;
+      const std::string& extension_id) override;
+  virtual void OnShutdown() override;
 
   // extensions::ExtensionRegistryObserver.
   virtual void OnExtensionLoaded(
       content::BrowserContext* browser_context,
-      const extensions::Extension* extension) OVERRIDE;
+      const extensions::Extension* extension) override;
   virtual void OnExtensionUnloaded(
       content::BrowserContext* browser_context,
       const extensions::Extension* extension,
-      extensions::UnloadedExtensionInfo::Reason reason) OVERRIDE;
+      extensions::UnloadedExtensionInfo::Reason reason) override;
   virtual void OnExtensionUninstalled(
       content::BrowserContext* browser_context,
       const extensions::Extension* extension,
-      extensions::UninstallReason reason) OVERRIDE;
-  virtual void OnShutdown(extensions::ExtensionRegistry* registry) OVERRIDE;
+      extensions::UninstallReason reason) override;
+  virtual void OnShutdown(extensions::ExtensionRegistry* registry) override;
 
   // AppListItemListObserver.
   virtual void OnListItemMoved(size_t from_index,
                                size_t to_index,
-                               app_list::AppListItem* item) OVERRIDE;
+                               app_list::AppListItem* item) override;
 
   scoped_ptr<ExtensionAppItem> CreateAppItem(
       const std::string& extension_id,
diff --git a/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc b/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc
index 33322b9..ae75068 100644
--- a/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc
+++ b/chrome/browser/ui/app_list/extension_app_model_builder_unittest.cc
@@ -67,35 +67,35 @@ scoped_refptr<extensions::Extension> MakeApp(const std::string& name,
 class TestAppListControllerDelegate : public AppListControllerDelegate {
  public:
   virtual ~TestAppListControllerDelegate() {}
-  virtual void DismissView() OVERRIDE {}
-  virtual gfx::NativeWindow GetAppListWindow() OVERRIDE { return NULL; }
-  virtual gfx::ImageSkia GetWindowIcon() OVERRIDE { return gfx::ImageSkia(); }
-  virtual bool IsAppPinned(const std::string& extension_id) OVERRIDE {
+  virtual void DismissView() override {}
+  virtual gfx::NativeWindow GetAppListWindow() override { return NULL; }
+  virtual gfx::ImageSkia GetWindowIcon() override { return gfx::ImageSkia(); }
+  virtual bool IsAppPinned(const std::string& extension_id) override {
     return false;
   }
-  virtual void PinApp(const std::string& extension_id) OVERRIDE {}
-  virtual void UnpinApp(const std::string& extension_id) OVERRIDE {}
-  virtual Pinnable GetPinnable() OVERRIDE { return NO_PIN; }
-  virtual bool CanDoCreateShortcutsFlow() OVERRIDE { return false; }
+  virtual void PinApp(const std::string& extension_id) override {}
+  virtual void UnpinApp(const std::string& extension_id) override {}
+  virtual Pinnable GetPinnable() override { return NO_PIN; }
+  virtual bool CanDoCreateShortcutsFlow() override { return false; }
   virtual void DoCreateShortcutsFlow(Profile* profile,
-                                     const std::string& extension_id) OVERRIDE {
+                                     const std::string& extension_id) override {
   }
-  virtual bool CanDoShowAppInfoFlow() OVERRIDE { return false; }
+  virtual bool CanDoShowAppInfoFlow() override { return false; }
   virtual void DoShowAppInfoFlow(Profile* profile,
-                                 const std::string& extension_id) OVERRIDE {
+                                 const std::string& extension_id) override {
   };
-  virtual void CreateNewWindow(Profile* profile, bool incognito) OVERRIDE {}
+  virtual void CreateNewWindow(Profile* profile, bool incognito) override {}
   virtual void ActivateApp(Profile* profile,
                            const extensions::Extension* extension,
                            AppListSource source,
-                           int event_flags) OVERRIDE {}
+                           int event_flags) override {}
   virtual void LaunchApp(Profile* profile,
                          const extensions::Extension* extension,
                          AppListSource source,
-                         int event_flags) OVERRIDE {}
+                         int event_flags) override {}
   virtual void ShowForProfileByPath(
-      const base::FilePath& profile_path) OVERRIDE {}
-  virtual bool ShouldShowUserIcon() OVERRIDE { return false; }
+      const base::FilePath& profile_path) override {}
+  virtual bool ShouldShowUserIcon() override { return false; }
 };
 
 const char kDefaultApps[] = "Packaged App 1,Packaged App 2,Hosted App";
@@ -108,13 +108,13 @@ class ExtensionAppModelBuilderTest : public AppListTestBase {
   ExtensionAppModelBuilderTest() {}
   virtual ~ExtensionAppModelBuilderTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     AppListTestBase::SetUp();
 
     CreateBuilder();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     ResetBuilder();
   }
 
diff --git a/chrome/browser/ui/app_list/extension_uninstaller.h b/chrome/browser/ui/app_list/extension_uninstaller.h
index 867063a..93a8e5b 100644
--- a/chrome/browser/ui/app_list/extension_uninstaller.h
+++ b/chrome/browser/ui/app_list/extension_uninstaller.h
@@ -25,8 +25,8 @@ class ExtensionUninstaller
 
  private:
   // Overridden from ExtensionUninstallDialog::Delegate:
-  virtual void ExtensionUninstallAccepted() OVERRIDE;
-  virtual void ExtensionUninstallCanceled() OVERRIDE;
+  virtual void ExtensionUninstallAccepted() override;
+  virtual void ExtensionUninstallCanceled() override;
   void CleanUp();
 
   Profile* profile_;
diff --git a/chrome/browser/ui/app_list/profile_loader_unittest.cc b/chrome/browser/ui/app_list/profile_loader_unittest.cc
index d833e0f..8d397b5 100644
--- a/chrome/browser/ui/app_list/profile_loader_unittest.cc
+++ b/chrome/browser/ui/app_list/profile_loader_unittest.cc
@@ -13,7 +13,7 @@
 
 class ProfileLoaderUnittest : public testing::Test {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     last_callback_result_ = NULL;
     profile1_.reset(
         new FakeProfile("p1", base::FilePath(FILE_PATH_LITERAL("profile1"))));
diff --git a/chrome/browser/ui/app_list/recommended_apps.h b/chrome/browser/ui/app_list/recommended_apps.h
index 25f82cd..7e4b13b 100644
--- a/chrome/browser/ui/app_list/recommended_apps.h
+++ b/chrome/browser/ui/app_list/recommended_apps.h
@@ -47,18 +47,18 @@ class RecommendedApps : public extensions::ExtensionRegistryObserver {
       const extensions::Extension* extension,
       bool is_update,
       bool from_ephemeral,
-      const std::string& old_name) OVERRIDE;
+      const std::string& old_name) override;
   virtual void OnExtensionLoaded(
       content::BrowserContext* browser_context,
-      const extensions::Extension* extension) OVERRIDE;
+      const extensions::Extension* extension) override;
   virtual void OnExtensionUnloaded(
       content::BrowserContext* browser_context,
       const extensions::Extension* extension,
-      extensions::UnloadedExtensionInfo::Reason reason) OVERRIDE;
+      extensions::UnloadedExtensionInfo::Reason reason) override;
   virtual void OnExtensionUninstalled(
       content::BrowserContext* browser_context,
       const extensions::Extension* extension,
-      extensions::UninstallReason reason) OVERRIDE;
+      extensions::UninstallReason reason) override;
 
   Profile* profile_;
   PrefChangeRegistrar pref_change_registrar_;
diff --git a/chrome/browser/ui/app_list/search/app_result.h b/chrome/browser/ui/app_list/search/app_result.h
index aebf662..c92b2dc 100644
--- a/chrome/browser/ui/app_list/search/app_result.h
+++ b/chrome/browser/ui/app_list/search/app_result.h
@@ -50,11 +50,11 @@ class AppResult : public ChromeSearchResult,
                               const base::Time& last_launched);
 
   // ChromeSearchResult overides:
-  virtual void Open(int event_flags) OVERRIDE;
-  virtual void InvokeAction(int action_index, int event_flags) OVERRIDE;
-  virtual scoped_ptr<ChromeSearchResult> Duplicate() OVERRIDE;
-  virtual ui::MenuModel* GetContextMenuModel() OVERRIDE;
-  virtual ChromeSearchResultType GetType() OVERRIDE;
+  virtual void Open(int event_flags) override;
+  virtual void InvokeAction(int action_index, int event_flags) override;
+  virtual scoped_ptr<ChromeSearchResult> Duplicate() override;
+  virtual ui::MenuModel* GetContextMenuModel() override;
+  virtual ChromeSearchResultType GetType() override;
 
  private:
   void StartObservingExtensionRegistry();
@@ -70,24 +70,24 @@ class AppResult : public ChromeSearchResult,
 
   // extensions::IconImage::Observer overrides:
   virtual void OnExtensionIconImageChanged(
-      extensions::IconImage* image) OVERRIDE;
+      extensions::IconImage* image) override;
 
   // AppContextMenuDelegate overrides:
-  virtual void ExecuteLaunchCommand(int event_flags) OVERRIDE;
+  virtual void ExecuteLaunchCommand(int event_flags) override;
 
   // ExtensionEnableFlowDelegate overrides:
-  virtual void ExtensionEnableFlowFinished() OVERRIDE;
-  virtual void ExtensionEnableFlowAborted(bool user_initiated) OVERRIDE;
+  virtual void ExtensionEnableFlowFinished() override;
+  virtual void ExtensionEnableFlowAborted(bool user_initiated) override;
 
   // extensions::ExtensionRegistryObserver override:
   virtual void OnExtensionLoaded(
       content::BrowserContext* browser_context,
-      const extensions::Extension* extension) OVERRIDE;
+      const extensions::Extension* extension) override;
   virtual void OnExtensionUninstalled(
       content::BrowserContext* browser_context,
       const extensions::Extension* extension,
-      extensions::UninstallReason reason) OVERRIDE;
-  virtual void OnShutdown(extensions::ExtensionRegistry* registry) OVERRIDE;
+      extensions::UninstallReason reason) override;
+  virtual void OnShutdown(extensions::ExtensionRegistry* registry) override;
 
   Profile* profile_;
   const std::string app_id_;
diff --git a/chrome/browser/ui/app_list/search/app_search_provider.h b/chrome/browser/ui/app_list/search/app_search_provider.h
index c451c71..a663e62 100644
--- a/chrome/browser/ui/app_list/search/app_search_provider.h
+++ b/chrome/browser/ui/app_list/search/app_search_provider.h
@@ -33,8 +33,8 @@ class AppSearchProvider : public SearchProvider,
   virtual ~AppSearchProvider();
 
   // SearchProvider overrides:
-  virtual void Start(const base::string16& query) OVERRIDE;
-  virtual void Stop() OVERRIDE;
+  virtual void Start(const base::string16& query) override;
+  virtual void Stop() override;
 
  private:
   class App;
@@ -51,11 +51,11 @@ class AppSearchProvider : public SearchProvider,
   // extensions::ExtensionRegistryObserver overrides:
   virtual void OnExtensionLoaded(
       content::BrowserContext* browser_context,
-      const extensions::Extension* extension) OVERRIDE;
+      const extensions::Extension* extension) override;
   virtual void OnExtensionUninstalled(
       content::BrowserContext* browser_context,
       const extensions::Extension* extension,
-      extensions::UninstallReason reason) OVERRIDE;
+      extensions::UninstallReason reason) override;
 
   Profile* profile_;
   AppListControllerDelegate* list_controller_;
diff --git a/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc b/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc
index c69bc34..d9ae5c2 100644
--- a/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc
+++ b/chrome/browser/ui/app_list/search/app_search_provider_unittest.cc
@@ -34,7 +34,7 @@ class AppSearchProviderTest : public AppListTestBase {
   virtual ~AppSearchProviderTest() {}
 
   // AppListTestBase overrides:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     AppListTestBase::SetUp();
 
     app_search_.reset(new AppSearchProvider(profile_.get(), NULL));
diff --git a/chrome/browser/ui/app_list/search/common/dictionary_data_store.h b/chrome/browser/ui/app_list/search/common/dictionary_data_store.h
index dac2f61..f731900 100644
--- a/chrome/browser/ui/app_list/search/common/dictionary_data_store.h
+++ b/chrome/browser/ui/app_list/search/common/dictionary_data_store.h
@@ -57,7 +57,7 @@ class DictionaryDataStore
   scoped_ptr<base::DictionaryValue> LoadOnBlockingPool();
 
   // ImportantFileWriter::DataSerializer overrides:
-  virtual bool SerializeData(std::string* data) OVERRIDE;
+  virtual bool SerializeData(std::string* data) override;
 
   base::FilePath data_file_;
   scoped_refptr<base::SequencedTaskRunner> file_task_runner_;
diff --git a/chrome/browser/ui/app_list/search/common/json_response_fetcher.h b/chrome/browser/ui/app_list/search/common/json_response_fetcher.h
index 07d49a2..b391db1 100644
--- a/chrome/browser/ui/app_list/search/common/json_response_fetcher.h
+++ b/chrome/browser/ui/app_list/search/common/json_response_fetcher.h
@@ -51,7 +51,7 @@ class JSONResponseFetcher : public net::URLFetcherDelegate {
   void OnJsonParseError(const std::string& error);
 
   // net::URLFetcherDelegate overrides:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   Callback callback_;
   net::URLRequestContextGetter* context_getter_;
diff --git a/chrome/browser/ui/app_list/search/common/url_icon_source.h b/chrome/browser/ui/app_list/search/common/url_icon_source.h
index 32465e8..0626f2a 100644
--- a/chrome/browser/ui/app_list/search/common/url_icon_source.h
+++ b/chrome/browser/ui/app_list/search/common/url_icon_source.h
@@ -45,15 +45,15 @@ class UrlIconSource : public gfx::ImageSkiaSource,
   void StartIconFetch();
 
   // gfx::ImageSkiaSource overrides:
-  virtual gfx::ImageSkiaRep GetImageForScale(float scale) OVERRIDE;
+  virtual gfx::ImageSkiaRep GetImageForScale(float scale) override;
 
   // net::URLFetcherDelegate overrides:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // ImageDecoder::Delegate overrides:
   virtual void OnImageDecoded(const ImageDecoder* decoder,
-                              const SkBitmap& decoded_image) OVERRIDE;
-  virtual void OnDecodeImageFailed(const ImageDecoder* decoder) OVERRIDE;
+                              const SkBitmap& decoded_image) override;
+  virtual void OnDecodeImageFailed(const ImageDecoder* decoder) override;
 
   IconLoadedCallback icon_loaded_callback_;
   net::URLRequestContextGetter* context_getter_;
diff --git a/chrome/browser/ui/app_list/search/common/webservice_cache_factory.h b/chrome/browser/ui/app_list/search/common/webservice_cache_factory.h
index c82d737..8e41626 100644
--- a/chrome/browser/ui/app_list/search/common/webservice_cache_factory.h
+++ b/chrome/browser/ui/app_list/search/common/webservice_cache_factory.h
@@ -35,7 +35,7 @@ class WebserviceCacheFactory : public BrowserContextKeyedServiceFactory {
 
   // BrowserContextKeyedServiceFactory overrides:
   virtual KeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* context) const OVERRIDE;
+      content::BrowserContext* context) const override;
 
   DISALLOW_COPY_AND_ASSIGN(WebserviceCacheFactory);
 };
diff --git a/chrome/browser/ui/app_list/search/history.h b/chrome/browser/ui/app_list/search/history.h
index c74387d..ddbd659 100644
--- a/chrome/browser/ui/app_list/search/history.h
+++ b/chrome/browser/ui/app_list/search/history.h
@@ -49,7 +49,7 @@ class History : public KeyedService, public HistoryDataObserver {
   friend class app_list::test::SearchHistoryTest;
 
   // HistoryDataObserver overrides:
-  virtual void OnHistoryDataLoadedFromStore() OVERRIDE;
+  virtual void OnHistoryDataLoadedFromStore() override;
 
   scoped_ptr<HistoryData> data_;
   scoped_refptr<HistoryDataStore> store_;
diff --git a/chrome/browser/ui/app_list/search/history_data_store_unittest.cc b/chrome/browser/ui/app_list/search/history_data_store_unittest.cc
index 43b7506..a508652 100644
--- a/chrome/browser/ui/app_list/search/history_data_store_unittest.cc
+++ b/chrome/browser/ui/app_list/search/history_data_store_unittest.cc
@@ -45,10 +45,10 @@ class HistoryDataStoreTest : public testing::Test {
   virtual ~HistoryDataStoreTest() {}
 
   // testing::Test overrides:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
   }
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // Release |store_| while ui loop is still running.
     store_ = NULL;
   }
diff --git a/chrome/browser/ui/app_list/search/history_factory.h b/chrome/browser/ui/app_list/search/history_factory.h
index 6c76e47..8804c82 100644
--- a/chrome/browser/ui/app_list/search/history_factory.h
+++ b/chrome/browser/ui/app_list/search/history_factory.h
@@ -34,7 +34,7 @@ class HistoryFactory : public BrowserContextKeyedServiceFactory {
 
   // BrowserContextKeyedServiceFactory overrides:
   virtual KeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* context) const OVERRIDE;
+      content::BrowserContext* context) const override;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryFactory);
 };
diff --git a/chrome/browser/ui/app_list/search/history_unittest.cc b/chrome/browser/ui/app_list/search/history_unittest.cc
index c0fdae9..f200fee 100644
--- a/chrome/browser/ui/app_list/search/history_unittest.cc
+++ b/chrome/browser/ui/app_list/search/history_unittest.cc
@@ -47,7 +47,7 @@ class HistoryDataLoadWaiter : public HistoryDataObserver {
 
  private:
   // HistoryDataObserver overrides:
-  virtual void OnHistoryDataLoadedFromStore() OVERRIDE {
+  virtual void OnHistoryDataLoadedFromStore() override {
     run_loop_->Quit();
   }
 
@@ -94,11 +94,11 @@ class SearchHistoryTest : public testing::Test {
   virtual ~SearchHistoryTest() {}
 
   // testing::Test overrides:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     profile_.reset(new TestingProfile);
     CreateHistory();
   }
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     Flush();
   }
 
diff --git a/chrome/browser/ui/app_list/search/mixer_unittest.cc b/chrome/browser/ui/app_list/search/mixer_unittest.cc
index 6d064cc..38ca5db 100644
--- a/chrome/browser/ui/app_list/search/mixer_unittest.cc
+++ b/chrome/browser/ui/app_list/search/mixer_unittest.cc
@@ -29,13 +29,13 @@ class TestSearchResult : public ChromeSearchResult {
   virtual ~TestSearchResult() {}
 
   // ChromeSearchResult overides:
-  virtual void Open(int event_flags) OVERRIDE {}
-  virtual void InvokeAction(int action_index, int event_flags) OVERRIDE {}
-  virtual scoped_ptr<ChromeSearchResult> Duplicate() OVERRIDE {
+  virtual void Open(int event_flags) override {}
+  virtual void InvokeAction(int action_index, int event_flags) override {}
+  virtual scoped_ptr<ChromeSearchResult> Duplicate() override {
     return scoped_ptr<ChromeSearchResult>(
         new TestSearchResult(id(), relevance())).Pass();
   }
-  virtual ChromeSearchResultType GetType() OVERRIDE {
+  virtual ChromeSearchResultType GetType() override {
     return SEARCH_RESULT_TYPE_BOUNDARY;
   }
 
@@ -63,7 +63,7 @@ class TestSearchProvider : public SearchProvider {
   virtual ~TestSearchProvider() {}
 
   // SearchProvider overrides:
-  virtual void Start(const base::string16& query) OVERRIDE {
+  virtual void Start(const base::string16& query) override {
     ClearResults();
     for (size_t i = 0; i < count_; ++i) {
       const std::string id =
@@ -72,7 +72,7 @@ class TestSearchProvider : public SearchProvider {
       Add(scoped_ptr<SearchResult>(new TestSearchResult(id, relevance)).Pass());
     }
   }
-  virtual void Stop() OVERRIDE {}
+  virtual void Stop() override {}
 
   void set_prefix(const std::string& prefix) { prefix_ = prefix; }
   void set_count(size_t count) { count_ = count; }
@@ -90,7 +90,7 @@ class MixerTest : public testing::Test {
   virtual ~MixerTest() {}
 
   // testing::Test overrides:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     results_.reset(new AppListModel::SearchResults);
 
     providers_.push_back(new TestSearchProvider("app"));
diff --git a/chrome/browser/ui/app_list/search/omnibox_provider.cc b/chrome/browser/ui/app_list/search/omnibox_provider.cc
index 483bddd..5e4f5d8 100644
--- a/chrome/browser/ui/app_list/search/omnibox_provider.cc
+++ b/chrome/browser/ui/app_list/search/omnibox_provider.cc
@@ -91,7 +91,7 @@ class OmniboxResult : public ChromeSearchResult {
   virtual ~OmniboxResult() {}
 
   // ChromeSearchResult overides:
-  virtual void Open(int event_flags) OVERRIDE {
+  virtual void Open(int event_flags) override {
     chrome::NavigateParams params(profile_,
                                   match_.destination_url,
                                   match_.transition);
@@ -99,14 +99,14 @@ class OmniboxResult : public ChromeSearchResult {
     chrome::Navigate(&params);
   }
 
-  virtual void InvokeAction(int action_index, int event_flags) OVERRIDE {}
+  virtual void InvokeAction(int action_index, int event_flags) override {}
 
-  virtual scoped_ptr<ChromeSearchResult> Duplicate() OVERRIDE {
+  virtual scoped_ptr<ChromeSearchResult> Duplicate() override {
     return scoped_ptr<ChromeSearchResult>(
         new OmniboxResult(profile_, autocomplete_controller_, match_)).Pass();
   }
 
-  virtual ChromeSearchResultType GetType() OVERRIDE {
+  virtual ChromeSearchResultType GetType() override {
     return OMNIBOX_SEARCH_RESULT;
   }
 
diff --git a/chrome/browser/ui/app_list/search/omnibox_provider.h b/chrome/browser/ui/app_list/search/omnibox_provider.h
index bb2cffd..ebb166d 100644
--- a/chrome/browser/ui/app_list/search/omnibox_provider.h
+++ b/chrome/browser/ui/app_list/search/omnibox_provider.h
@@ -24,15 +24,15 @@ class OmniboxProvider : public SearchProvider,
   virtual ~OmniboxProvider();
 
   // SearchProvider overrides:
-  virtual void Start(const base::string16& query) OVERRIDE;
-  virtual void Stop() OVERRIDE;
+  virtual void Start(const base::string16& query) override;
+  virtual void Stop() override;
 
  private:
   // Populates result list from AutocompleteResult.
   void PopulateFromACResult(const AutocompleteResult& result);
 
   // AutocompleteControllerDelegate overrides:
-  virtual void OnResultChanged(bool default_match_changed) OVERRIDE;
+  virtual void OnResultChanged(bool default_match_changed) override;
 
   Profile* profile_;
 
diff --git a/chrome/browser/ui/app_list/search/people/people_provider.h b/chrome/browser/ui/app_list/search/people/people_provider.h
index 9e0ade2..141fce5 100644
--- a/chrome/browser/ui/app_list/search/people/people_provider.h
+++ b/chrome/browser/ui/app_list/search/people/people_provider.h
@@ -37,17 +37,17 @@ class PeopleProvider : public WebserviceSearchProvider,
   virtual ~PeopleProvider();
 
   // SearchProvider overrides:
-  virtual void Start(const base::string16& query) OVERRIDE;
-  virtual void Stop() OVERRIDE;
+  virtual void Start(const base::string16& query) override;
+  virtual void Stop() override;
 
   // OAuth2TokenService::Consumer overrides:
   virtual void OnGetTokenSuccess(
       const OAuth2TokenService::Request* request,
       const std::string& access_token,
-      const base::Time& expiration_time) OVERRIDE;
+      const base::Time& expiration_time) override;
   virtual void OnGetTokenFailure(
       const OAuth2TokenService::Request* request,
-      const GoogleServiceAuthError& error) OVERRIDE;
+      const GoogleServiceAuthError& error) override;
 
  private:
   friend class app_list::test::PeopleProviderTest;
diff --git a/chrome/browser/ui/app_list/search/people/people_provider_browsertest.cc b/chrome/browser/ui/app_list/search/people/people_provider_browsertest.cc
index 4b35d3d..7c0a892 100644
--- a/chrome/browser/ui/app_list/search/people/people_provider_browsertest.cc
+++ b/chrome/browser/ui/app_list/search/people/people_provider_browsertest.cc
@@ -165,7 +165,7 @@ class PeopleProviderTest : public InProcessBrowserTest {
   virtual ~PeopleProviderTest() {}
 
   // InProcessBrowserTest overrides:
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     test_server_.reset(new EmbeddedTestServer);
 
     ASSERT_TRUE(test_server_->InitializeAndWaitUntilReady());
@@ -183,7 +183,7 @@ class PeopleProviderTest : public InProcessBrowserTest {
     people_provider_->set_use_throttling(false);
   }
 
-  virtual void TearDownOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() override {
     EXPECT_TRUE(test_server_->ShutdownAndWaitUntilComplete());
     test_server_.reset();
   }
diff --git a/chrome/browser/ui/app_list/search/people/people_result.h b/chrome/browser/ui/app_list/search/people/people_result.h
index d6d2ea8..87f18d2 100644
--- a/chrome/browser/ui/app_list/search/people/people_result.h
+++ b/chrome/browser/ui/app_list/search/people/people_result.h
@@ -24,10 +24,10 @@ class PeopleResult : public ChromeSearchResult {
   virtual ~PeopleResult();
 
   // ChromeSearchResult overides:
-  virtual void Open(int event_flags) OVERRIDE;
-  virtual void InvokeAction(int action_index, int event_flags) OVERRIDE;
-  virtual scoped_ptr<ChromeSearchResult> Duplicate() OVERRIDE;
-  virtual ChromeSearchResultType GetType() OVERRIDE;
+  virtual void Open(int event_flags) override;
+  virtual void InvokeAction(int action_index, int event_flags) override;
+  virtual scoped_ptr<ChromeSearchResult> Duplicate() override;
+  virtual ChromeSearchResultType GetType() override;
 
  private:
   void OnIconLoaded();
diff --git a/chrome/browser/ui/app_list/search/search_controller.h b/chrome/browser/ui/app_list/search/search_controller.h
index 5809bf1..923adce 100644
--- a/chrome/browser/ui/app_list/search/search_controller.h
+++ b/chrome/browser/ui/app_list/search/search_controller.h
@@ -58,7 +58,7 @@ class SearchController : public SpeechUIModelObserver {
 
   // SpeechUIModelObserver overrides:
   virtual void OnSpeechRecognitionStateChanged(
-      SpeechRecognitionState new_state) OVERRIDE;
+      SpeechRecognitionState new_state) override;
 
   Profile* profile_;
   SearchBoxModel* search_box_;
diff --git a/chrome/browser/ui/app_list/search/search_webstore_result.h b/chrome/browser/ui/app_list/search/search_webstore_result.h
index 0f494b8..bd7fadf 100644
--- a/chrome/browser/ui/app_list/search/search_webstore_result.h
+++ b/chrome/browser/ui/app_list/search/search_webstore_result.h
@@ -22,10 +22,10 @@ class SearchWebstoreResult : public ChromeSearchResult {
   virtual ~SearchWebstoreResult();
 
   // ChromeSearchResult overides:
-  virtual void Open(int event_flags) OVERRIDE;
-  virtual void InvokeAction(int action_index, int event_flags) OVERRIDE;
-  virtual scoped_ptr<ChromeSearchResult> Duplicate() OVERRIDE;
-  virtual ChromeSearchResultType GetType() OVERRIDE;
+  virtual void Open(int event_flags) override;
+  virtual void InvokeAction(int action_index, int event_flags) override;
+  virtual scoped_ptr<ChromeSearchResult> Duplicate() override;
+  virtual ChromeSearchResultType GetType() override;
 
  private:
   Profile* profile_;
diff --git a/chrome/browser/ui/app_list/search/webstore/webstore_provider.h b/chrome/browser/ui/app_list/search/webstore/webstore_provider.h
index 1dc09ad..1526512 100644
--- a/chrome/browser/ui/app_list/search/webstore/webstore_provider.h
+++ b/chrome/browser/ui/app_list/search/webstore/webstore_provider.h
@@ -34,8 +34,8 @@ class WebstoreProvider : public WebserviceSearchProvider{
   virtual ~WebstoreProvider();
 
   // SearchProvider overrides:
-  virtual void Start(const base::string16& query) OVERRIDE;
-  virtual void Stop() OVERRIDE;
+  virtual void Start(const base::string16& query) override;
+  virtual void Stop() override;
 
  private:
   friend class app_list::test::WebstoreProviderTest;
diff --git a/chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc b/chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc
index c509474..426880d 100644
--- a/chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc
+++ b/chrome/browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc
@@ -100,7 +100,7 @@ class WebstoreProviderTest : public InProcessBrowserTest {
   virtual ~WebstoreProviderTest() {}
 
   // InProcessBrowserTest overrides:
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     test_server_.reset(new EmbeddedTestServer);
 
     ASSERT_TRUE(test_server_->InitializeAndWaitUntilReady());
@@ -121,7 +121,7 @@ class WebstoreProviderTest : public InProcessBrowserTest {
     webstore_provider_->set_use_throttling(false);
   }
 
-  virtual void TearDownOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() override {
     EXPECT_TRUE(test_server_->ShutdownAndWaitUntilComplete());
     test_server_.reset();
   }
diff --git a/chrome/browser/ui/app_list/search/webstore/webstore_result.cc b/chrome/browser/ui/app_list/search/webstore/webstore_result.cc
index 6b3d25b..919dd50 100644
--- a/chrome/browser/ui/app_list/search/webstore/webstore_result.cc
+++ b/chrome/browser/ui/app_list/search/webstore/webstore_result.cc
@@ -43,7 +43,7 @@ class BadgedIconSource : public gfx::CanvasImageSource {
   BadgedIconSource(const gfx::ImageSkia& icon, const gfx::Size& icon_size)
       : CanvasImageSource(icon_size, false), icon_(icon) {}
 
-  virtual void Draw(gfx::Canvas* canvas) OVERRIDE {
+  virtual void Draw(gfx::Canvas* canvas) override {
     canvas->DrawImageInt(icon_, 0, 0);
     const gfx::ImageSkia& badge = *ui::ResourceBundle::GetSharedInstance().
          GetImageSkiaNamed(IDR_WEBSTORE_ICON_16);
diff --git a/chrome/browser/ui/app_list/search/webstore/webstore_result.h b/chrome/browser/ui/app_list/search/webstore/webstore_result.h
index 25f32f5..a918922 100644
--- a/chrome/browser/ui/app_list/search/webstore/webstore_result.h
+++ b/chrome/browser/ui/app_list/search/webstore/webstore_result.h
@@ -45,10 +45,10 @@ class WebstoreResult : public ChromeSearchResult,
   bool is_paid() const { return is_paid_; }
 
   // ChromeSearchResult overides:
-  virtual void Open(int event_flags) OVERRIDE;
-  virtual void InvokeAction(int action_index, int event_flags) OVERRIDE;
-  virtual scoped_ptr<ChromeSearchResult> Duplicate() OVERRIDE;
-  virtual ChromeSearchResultType GetType() OVERRIDE;
+  virtual void Open(int event_flags) override;
+  virtual void InvokeAction(int action_index, int event_flags) override;
+  virtual scoped_ptr<ChromeSearchResult> Duplicate() override;
+  virtual ChromeSearchResultType GetType() override;
 
  private:
   // Set the initial state and start observing both InstallObserver and
@@ -71,15 +71,15 @@ class WebstoreResult : public ChromeSearchResult,
 
   // extensions::InstallObserver overrides:
   virtual void OnDownloadProgress(const std::string& extension_id,
-                                  int percent_downloaded) OVERRIDE;
-  virtual void OnShutdown() OVERRIDE;
+                                  int percent_downloaded) override;
+  virtual void OnShutdown() override;
 
   // extensions::ExtensionRegistryObserver overides:
   virtual void OnExtensionInstalled(
       content::BrowserContext* browser_context,
       const extensions::Extension* extension,
-      bool is_update) OVERRIDE;
-  virtual void OnShutdown(extensions::ExtensionRegistry* registry) OVERRIDE;
+      bool is_update) override;
+  virtual void OnShutdown(extensions::ExtensionRegistry* registry) override;
 
   Profile* profile_;
   const std::string app_id_;
diff --git a/chrome/browser/ui/app_list/start_page_service.cc b/chrome/browser/ui/app_list/start_page_service.cc
index 1f0bb9d..92a0fa5 100644
--- a/chrome/browser/ui/app_list/start_page_service.cc
+++ b/chrome/browser/ui/app_list/start_page_service.cc
@@ -62,7 +62,7 @@ class StartPageService::ProfileDestroyObserver
   // content::NotificationObserver
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE {
+                       const content::NotificationDetails& details) override {
     DCHECK_EQ(chrome::NOTIFICATION_PROFILE_DESTROYED, type);
     DCHECK_EQ(service_->profile(), content::Source<Profile>(source).ptr());
     service_->Shutdown();
@@ -83,7 +83,7 @@ class StartPageService::StartPageWebContentsDelegate
   virtual void RequestMediaAccessPermission(
       content::WebContents* web_contents,
       const content::MediaStreamRequest& request,
-      const content::MediaResponseCallback& callback) OVERRIDE {
+      const content::MediaResponseCallback& callback) override {
     if (MediaStreamInfoBarDelegate::Create(web_contents, request, callback))
       NOTREACHED() << "Media stream not allowed for WebUI";
   }
@@ -91,7 +91,7 @@ class StartPageService::StartPageWebContentsDelegate
   virtual bool CheckMediaAccessPermission(
       content::WebContents* web_contents,
       const GURL& security_origin,
-      content::MediaStreamType type) OVERRIDE {
+      content::MediaStreamType type) override {
     return MediaCaptureDevicesDispatcher::GetInstance()
         ->CheckMediaAccessPermission(web_contents, security_origin, type);
   }
diff --git a/chrome/browser/ui/app_list/start_page_service.h b/chrome/browser/ui/app_list/start_page_service.h
index 7bcded2..33db7b2 100644
--- a/chrome/browser/ui/app_list/start_page_service.h
+++ b/chrome/browser/ui/app_list/start_page_service.h
@@ -77,7 +77,7 @@ class StartPageService : public KeyedService {
   void UnloadContents();
 
   // KeyedService overrides:
-  virtual void Shutdown() OVERRIDE;
+  virtual void Shutdown() override;
 
   Profile* profile_;
   scoped_ptr<content::WebContents> contents_;
diff --git a/chrome/browser/ui/app_list/start_page_service_factory.h b/chrome/browser/ui/app_list/start_page_service_factory.h
index 647b565..d6931b0 100644
--- a/chrome/browser/ui/app_list/start_page_service_factory.h
+++ b/chrome/browser/ui/app_list/start_page_service_factory.h
@@ -30,7 +30,7 @@ class StartPageServiceFactory : public BrowserContextKeyedServiceFactory {
 
   // BrowserContextKeyedServiceFactory overrides:
   virtual KeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* context) const OVERRIDE;
+      content::BrowserContext* context) const override;
 
   DISALLOW_COPY_AND_ASSIGN(StartPageServiceFactory);
 };
diff --git a/chrome/browser/ui/app_list/test/fake_profile.h b/chrome/browser/ui/app_list/test/fake_profile.h
index 3b34e0d..6a49bbf 100644
--- a/chrome/browser/ui/app_list/test/fake_profile.h
+++ b/chrome/browser/ui/app_list/test/fake_profile.h
@@ -30,72 +30,72 @@ class FakeProfile : public Profile {
   FakeProfile(const std::string& name, const base::FilePath& path);
 
   // Profile overrides.
-  virtual std::string GetProfileName() OVERRIDE;
-  virtual ProfileType GetProfileType() const OVERRIDE;
-  virtual base::FilePath GetPath() const OVERRIDE;
-  virtual bool IsOffTheRecord() const OVERRIDE;
+  virtual std::string GetProfileName() override;
+  virtual ProfileType GetProfileType() const override;
+  virtual base::FilePath GetPath() const override;
+  virtual bool IsOffTheRecord() const override;
   virtual content::DownloadManagerDelegate*
-      GetDownloadManagerDelegate() OVERRIDE;
+      GetDownloadManagerDelegate() override;
   virtual net::URLRequestContextGetter* GetRequestContextForRenderProcess(
-      int renderer_child_id) OVERRIDE;
-  virtual net::URLRequestContextGetter* GetMediaRequestContext() OVERRIDE;
+      int renderer_child_id) override;
+  virtual net::URLRequestContextGetter* GetMediaRequestContext() override;
   virtual net::URLRequestContextGetter* GetMediaRequestContextForRenderProcess(
-      int renderer_child_id) OVERRIDE;
+      int renderer_child_id) override;
   virtual net::URLRequestContextGetter*
       GetMediaRequestContextForStoragePartition(
           const base::FilePath& partition_path,
-          bool in_memory) OVERRIDE;
-  virtual content::ResourceContext* GetResourceContext() OVERRIDE;
-  virtual content::BrowserPluginGuestManager* GetGuestManager() OVERRIDE;
-  virtual storage::SpecialStoragePolicy* GetSpecialStoragePolicy() OVERRIDE;
-  virtual content::PushMessagingService* GetPushMessagingService() OVERRIDE;
-  virtual content::SSLHostStateDelegate* GetSSLHostStateDelegate() OVERRIDE;
-  virtual scoped_refptr<base::SequencedTaskRunner> GetIOTaskRunner() OVERRIDE;
-  virtual Profile* GetOffTheRecordProfile() OVERRIDE;
-  virtual void DestroyOffTheRecordProfile() OVERRIDE;
-  virtual bool HasOffTheRecordProfile() OVERRIDE;
-  virtual Profile* GetOriginalProfile() OVERRIDE;
-  virtual bool IsSupervised() OVERRIDE;
-  virtual history::TopSites* GetTopSites() OVERRIDE;
-  virtual history::TopSites* GetTopSitesWithoutCreating() OVERRIDE;
+          bool in_memory) override;
+  virtual content::ResourceContext* GetResourceContext() override;
+  virtual content::BrowserPluginGuestManager* GetGuestManager() override;
+  virtual storage::SpecialStoragePolicy* GetSpecialStoragePolicy() override;
+  virtual content::PushMessagingService* GetPushMessagingService() override;
+  virtual content::SSLHostStateDelegate* GetSSLHostStateDelegate() override;
+  virtual scoped_refptr<base::SequencedTaskRunner> GetIOTaskRunner() override;
+  virtual Profile* GetOffTheRecordProfile() override;
+  virtual void DestroyOffTheRecordProfile() override;
+  virtual bool HasOffTheRecordProfile() override;
+  virtual Profile* GetOriginalProfile() override;
+  virtual bool IsSupervised() override;
+  virtual history::TopSites* GetTopSites() override;
+  virtual history::TopSites* GetTopSitesWithoutCreating() override;
   virtual ExtensionSpecialStoragePolicy*
-      GetExtensionSpecialStoragePolicy() OVERRIDE;
-  virtual PrefService* GetPrefs() OVERRIDE;
-  virtual PrefService* GetOffTheRecordPrefs() OVERRIDE;
-  virtual net::URLRequestContextGetter* GetRequestContext() OVERRIDE;
+      GetExtensionSpecialStoragePolicy() override;
+  virtual PrefService* GetPrefs() override;
+  virtual PrefService* GetOffTheRecordPrefs() override;
+  virtual net::URLRequestContextGetter* GetRequestContext() override;
   virtual net::URLRequestContextGetter*
-      GetRequestContextForExtensions() OVERRIDE;
-  virtual net::SSLConfigService* GetSSLConfigService() OVERRIDE;
-  virtual HostContentSettingsMap* GetHostContentSettingsMap() OVERRIDE;
-  virtual bool IsSameProfile(Profile* profile) OVERRIDE;
-  virtual base::Time GetStartTime() const OVERRIDE;
+      GetRequestContextForExtensions() override;
+  virtual net::SSLConfigService* GetSSLConfigService() override;
+  virtual HostContentSettingsMap* GetHostContentSettingsMap() override;
+  virtual bool IsSameProfile(Profile* profile) override;
+  virtual base::Time GetStartTime() const override;
   virtual net::URLRequestContextGetter* CreateRequestContext(
       content::ProtocolHandlerMap* protocol_handlers,
-      content::URLRequestInterceptorScopedVector request_interceptors) OVERRIDE;
+      content::URLRequestInterceptorScopedVector request_interceptors) override;
   virtual net::URLRequestContextGetter* CreateRequestContextForStoragePartition(
       const base::FilePath& partition_path,
       bool in_memory,
       content::ProtocolHandlerMap* protocol_handlers,
-      content::URLRequestInterceptorScopedVector request_interceptors) OVERRIDE;
-  virtual base::FilePath last_selected_directory() OVERRIDE;
-  virtual void set_last_selected_directory(const base::FilePath& path) OVERRIDE;
+      content::URLRequestInterceptorScopedVector request_interceptors) override;
+  virtual base::FilePath last_selected_directory() override;
+  virtual void set_last_selected_directory(const base::FilePath& path) override;
 
 #if defined(OS_CHROMEOS)
   virtual void ChangeAppLocale(
-      const std::string& locale, AppLocaleChangedVia via) OVERRIDE;
-  virtual void OnLogin() OVERRIDE;
-  virtual void InitChromeOSPreferences() OVERRIDE;
+      const std::string& locale, AppLocaleChangedVia via) override;
+  virtual void OnLogin() override;
+  virtual void InitChromeOSPreferences() override;
 #endif  // defined(OS_CHROMEOS)
 
-  virtual PrefProxyConfigTracker* GetProxyConfigTracker() OVERRIDE;
-  virtual chrome_browser_net::Predictor* GetNetworkPredictor() OVERRIDE;
-  virtual DevToolsNetworkController* GetDevToolsNetworkController() OVERRIDE;
+  virtual PrefProxyConfigTracker* GetProxyConfigTracker() override;
+  virtual chrome_browser_net::Predictor* GetNetworkPredictor() override;
+  virtual DevToolsNetworkController* GetDevToolsNetworkController() override;
   virtual void ClearNetworkingHistorySince(
-      base::Time time, const base::Closure& completion) OVERRIDE;
-  virtual GURL GetHomePage() OVERRIDE;
-  virtual bool WasCreatedByVersionOrLater(const std::string& version) OVERRIDE;
-  virtual void SetExitType(ExitType exit_type) OVERRIDE;
-  virtual ExitType GetLastSessionExitType() OVERRIDE;
+      base::Time time, const base::Closure& completion) override;
+  virtual GURL GetHomePage() override;
+  virtual bool WasCreatedByVersionOrLater(const std::string& version) override;
+  virtual void SetExitType(ExitType exit_type) override;
+  virtual ExitType GetLastSessionExitType() override;
 
  private:
   std::string name_;
diff --git a/chrome/browser/ui/app_list/test/fake_profile_store.h b/chrome/browser/ui/app_list/test/fake_profile_store.h
index 68622dc..26698a9 100644
--- a/chrome/browser/ui/app_list/test/fake_profile_store.h
+++ b/chrome/browser/ui/app_list/test/fake_profile_store.h
@@ -20,13 +20,13 @@ class FakeProfileStore : public ProfileStore {
   void RemoveProfile(Profile* profile);
 
   // ProfileStore overrides.
-  virtual void AddProfileObserver(ProfileInfoCacheObserver* observer) OVERRIDE;
+  virtual void AddProfileObserver(ProfileInfoCacheObserver* observer) override;
   virtual void LoadProfileAsync(
       const base::FilePath& path,
-      base::Callback<void(Profile*)> callback) OVERRIDE;
-  virtual Profile* GetProfileByPath(const base::FilePath& path) OVERRIDE;
-  virtual base::FilePath GetUserDataDir() OVERRIDE;
-  virtual bool IsProfileSupervised(const base::FilePath& path) OVERRIDE;
+      base::Callback<void(Profile*)> callback) override;
+  virtual Profile* GetProfileByPath(const base::FilePath& path) override;
+  virtual base::FilePath GetUserDataDir() override;
+  virtual bool IsProfileSupervised(const base::FilePath& path) override;
 
  private:
   base::FilePath user_data_dir_;
diff --git a/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h b/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h
index bd0dbb8..01b3aa5 100644
--- a/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h
+++ b/chrome/browser/ui/app_modal_dialogs/javascript_app_modal_dialog.h
@@ -45,9 +45,9 @@ class JavaScriptAppModalDialog : public AppModalDialog {
   virtual ~JavaScriptAppModalDialog();
 
   // Overridden from AppModalDialog:
-  virtual NativeAppModalDialog* CreateNativeDialog() OVERRIDE;
-  virtual bool IsJavaScriptModalDialog() OVERRIDE;
-  virtual void Invalidate() OVERRIDE;
+  virtual NativeAppModalDialog* CreateNativeDialog() override;
+  virtual bool IsJavaScriptModalDialog() override;
+  virtual void Invalidate() override;
 
   // Callbacks from NativeDialog when the user accepts or cancels the dialog.
   void OnCancel(bool suppress_js_messages);
diff --git a/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc b/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc
index 02e981c..e977a96 100644
--- a/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc
+++ b/chrome/browser/ui/app_modal_dialogs/javascript_dialog_manager.cc
@@ -96,23 +96,23 @@ class ChromeJavaScriptDialogManager : public JavaScriptDialogManager {
       const base::string16& message_text,
       const base::string16& default_prompt_text,
       const DialogClosedCallback& callback,
-      bool* did_suppress_message) OVERRIDE;
+      bool* did_suppress_message) override;
 
   virtual void RunBeforeUnloadDialog(
       WebContents* web_contents,
       const base::string16& message_text,
       bool is_reload,
-      const DialogClosedCallback& callback) OVERRIDE;
+      const DialogClosedCallback& callback) override;
 
   virtual bool HandleJavaScriptDialog(
       WebContents* web_contents,
       bool accept,
-      const base::string16* prompt_override) OVERRIDE;
+      const base::string16* prompt_override) override;
 
   virtual void CancelActiveAndPendingDialogs(
-      WebContents* web_contents) OVERRIDE;
+      WebContents* web_contents) override;
 
-  virtual void WebContentsDestroyed(WebContents* web_contents) OVERRIDE;
+  virtual void WebContentsDestroyed(WebContents* web_contents) override;
 
  private:
   friend struct DefaultSingletonTraits<ChromeJavaScriptDialogManager>;
diff --git a/chrome/browser/ui/apps/chrome_app_delegate.cc b/chrome/browser/ui/apps/chrome_app_delegate.cc
index 5438d59..14307cc 100644
--- a/chrome/browser/ui/apps/chrome_app_delegate.cc
+++ b/chrome/browser/ui/apps/chrome_app_delegate.cc
@@ -82,7 +82,7 @@ class OpenURLFromTabBasedOnBrowserDefault
   // Opens a URL when called with the result of if this is the default system
   // browser or not.
   virtual void SetDefaultWebClientUIState(
-      ShellIntegration::DefaultWebClientUIState state) OVERRIDE {
+      ShellIntegration::DefaultWebClientUIState state) override {
     Profile* profile =
         Profile::FromBrowserContext(source_->GetBrowserContext());
     DCHECK(profile);
@@ -101,7 +101,7 @@ class OpenURLFromTabBasedOnBrowserDefault
     }
   }
 
-  virtual bool IsOwnedByWorker() OVERRIDE { return true; }
+  virtual bool IsOwnedByWorker() override { return true; }
 
  private:
   scoped_ptr<content::WebContents> source_;
@@ -118,7 +118,7 @@ class ChromeAppDelegate::NewWindowContentsDelegate
 
   virtual content::WebContents* OpenURLFromTab(
       content::WebContents* source,
-      const content::OpenURLParams& params) OVERRIDE;
+      const content::OpenURLParams& params) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NewWindowContentsDelegate);
diff --git a/chrome/browser/ui/apps/chrome_app_delegate.h b/chrome/browser/ui/apps/chrome_app_delegate.h
index 8de0390..f39887f 100644
--- a/chrome/browser/ui/apps/chrome_app_delegate.h
+++ b/chrome/browser/ui/apps/chrome_app_delegate.h
@@ -34,46 +34,46 @@ class ChromeAppDelegate : public extensions::AppDelegate,
   class NewWindowContentsDelegate;
 
   // extensions::AppDelegate:
-  virtual void InitWebContents(content::WebContents* web_contents) OVERRIDE;
+  virtual void InitWebContents(content::WebContents* web_contents) override;
   virtual void ResizeWebContents(content::WebContents* web_contents,
-                                 const gfx::Size& size) OVERRIDE;
+                                 const gfx::Size& size) override;
   virtual content::WebContents* OpenURLFromTab(
       content::BrowserContext* context,
       content::WebContents* source,
-      const content::OpenURLParams& params) OVERRIDE;
+      const content::OpenURLParams& params) override;
   virtual void AddNewContents(content::BrowserContext* context,
                               content::WebContents* new_contents,
                               WindowOpenDisposition disposition,
                               const gfx::Rect& initial_pos,
                               bool user_gesture,
-                              bool* was_blocked) OVERRIDE;
+                              bool* was_blocked) override;
   virtual content::ColorChooser* ShowColorChooser(
       content::WebContents* web_contents,
-      SkColor initial_color) OVERRIDE;
+      SkColor initial_color) override;
   virtual void RunFileChooser(
       content::WebContents* tab,
-      const content::FileChooserParams& params) OVERRIDE;
+      const content::FileChooserParams& params) override;
   virtual void RequestMediaAccessPermission(
       content::WebContents* web_contents,
       const content::MediaStreamRequest& request,
       const content::MediaResponseCallback& callback,
-      const extensions::Extension* extension) OVERRIDE;
+      const extensions::Extension* extension) override;
   virtual bool CheckMediaAccessPermission(
       content::WebContents* web_contents,
       const GURL& security_origin,
       content::MediaStreamType type,
-      const extensions::Extension* extension) OVERRIDE;
-  virtual int PreferredIconSize() OVERRIDE;
+      const extensions::Extension* extension) override;
+  virtual int PreferredIconSize() override;
   virtual void SetWebContentsBlocked(content::WebContents* web_contents,
-                                     bool blocked) OVERRIDE;
+                                     bool blocked) override;
   virtual bool IsWebContentsVisible(
-      content::WebContents* web_contents) OVERRIDE;
-  virtual void SetTerminatingCallback(const base::Closure& callback) OVERRIDE;
+      content::WebContents* web_contents) override;
+  virtual void SetTerminatingCallback(const base::Closure& callback) override;
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   scoped_ptr<ScopedKeepAlive> keep_alive_;
   scoped_ptr<NewWindowContentsDelegate> new_window_contents_delegate_;
diff --git a/chrome/browser/ui/apps/chrome_app_window_client.h b/chrome/browser/ui/apps/chrome_app_window_client.h
index 6e10ffa..c11d55b 100644
--- a/chrome/browser/ui/apps/chrome_app_window_client.h
+++ b/chrome/browser/ui/apps/chrome_app_window_client.h
@@ -27,13 +27,13 @@ class ChromeAppWindowClient : public extensions::AppWindowClient {
   // extensions::AppWindowClient
   virtual extensions::AppWindow* CreateAppWindow(
       content::BrowserContext* context,
-      const extensions::Extension* extension) OVERRIDE;
+      const extensions::Extension* extension) override;
   virtual extensions::NativeAppWindow* CreateNativeAppWindow(
       extensions::AppWindow* window,
-      const extensions::AppWindow::CreateParams& params) OVERRIDE;
+      const extensions::AppWindow::CreateParams& params) override;
   virtual void OpenDevToolsWindow(content::WebContents* web_contents,
-                                  const base::Closure& callback) OVERRIDE;
-  virtual bool IsCurrentChannelOlderThanDev() OVERRIDE;
+                                  const base::Closure& callback) override;
+  virtual bool IsCurrentChannelOlderThanDev() override;
 
   // Implemented in platform specific code.
   static extensions::NativeAppWindow* CreateNativeAppWindowImpl(
diff --git a/chrome/browser/ui/apps/directory_access_confirmation_dialog.cc b/chrome/browser/ui/apps/directory_access_confirmation_dialog.cc
index 94e594f..2b42da9 100644
--- a/chrome/browser/ui/apps/directory_access_confirmation_dialog.cc
+++ b/chrome/browser/ui/apps/directory_access_confirmation_dialog.cc
@@ -21,15 +21,15 @@ class DirectoryAccessConfirmationDialog : public TabModalConfirmDialogDelegate {
                                     const base::Closure& on_accept,
                                     const base::Closure& on_cancel);
 
-  virtual base::string16 GetTitle() OVERRIDE;
-  virtual base::string16 GetDialogMessage() OVERRIDE;
-  virtual base::string16 GetAcceptButtonTitle() OVERRIDE;
-  virtual base::string16 GetCancelButtonTitle() OVERRIDE;
+  virtual base::string16 GetTitle() override;
+  virtual base::string16 GetDialogMessage() override;
+  virtual base::string16 GetAcceptButtonTitle() override;
+  virtual base::string16 GetCancelButtonTitle() override;
 
  private:
-  virtual void OnAccepted() OVERRIDE;
-  virtual void OnCanceled() OVERRIDE;
-  virtual void OnClosed() OVERRIDE;
+  virtual void OnAccepted() override;
+  virtual void OnCanceled() override;
+  virtual void OnClosed() override;
 
   const base::Closure on_accept_;
   const base::Closure on_cancel_;
diff --git a/chrome/browser/ui/ash/accelerator_commands_browsertest.cc b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc
index 24efe6d..a9caa84 100644
--- a/chrome/browser/ui/ash/accelerator_commands_browsertest.cc
+++ b/chrome/browser/ui/ash/accelerator_commands_browsertest.cc
@@ -36,7 +36,7 @@ class MaximizableWidgetDelegate : public views::WidgetDelegateView {
   virtual ~MaximizableWidgetDelegate() {
   }
 
-  virtual bool CanMaximize() const OVERRIDE {
+  virtual bool CanMaximize() const override {
     return true;
   }
 
diff --git a/chrome/browser/ui/ash/accessibility/automation_manager_ash.h b/chrome/browser/ui/ash/accessibility/automation_manager_ash.h
index 4ad089c..b860a73f 100644
--- a/chrome/browser/ui/ash/accessibility/automation_manager_ash.h
+++ b/chrome/browser/ui/ash/accessibility/automation_manager_ash.h
@@ -41,10 +41,10 @@ class AutomationManagerAsh : public extensions::AutomationActionAdapter {
                    ui::AXEvent event_type);
 
   // AutomationActionAdapter implementation.
-  virtual void DoDefault(int32 id) OVERRIDE;
-  virtual void Focus(int32 id) OVERRIDE;
-  virtual void MakeVisible(int32 id) OVERRIDE;
-  virtual void SetSelection(int32 id, int32 start, int32 end) OVERRIDE;
+  virtual void DoDefault(int32 id) override;
+  virtual void Focus(int32 id) override;
+  virtual void MakeVisible(int32 id) override;
+  virtual void SetSelection(int32 id, int32 start, int32 end) override;
 
  protected:
   virtual ~AutomationManagerAsh();
diff --git a/chrome/browser/ui/ash/accessibility/ax_root_obj_wrapper.h b/chrome/browser/ui/ash/accessibility/ax_root_obj_wrapper.h
index d75c377..20c4688 100644
--- a/chrome/browser/ui/ash/accessibility/ax_root_obj_wrapper.h
+++ b/chrome/browser/ui/ash/accessibility/ax_root_obj_wrapper.h
@@ -17,11 +17,11 @@ class AXRootObjWrapper : public views::AXAuraObjWrapper {
   bool HasChild(views::AXAuraObjWrapper* child);
 
   // views::AXAuraObjWrapper overrides.
-  virtual views::AXAuraObjWrapper* GetParent() OVERRIDE;
+  virtual views::AXAuraObjWrapper* GetParent() override;
   virtual void GetChildren(
-      std::vector<views::AXAuraObjWrapper*>* out_children) OVERRIDE;
-  virtual void Serialize(ui::AXNodeData* out_node_data) OVERRIDE;
-  virtual int32 GetID() OVERRIDE;
+      std::vector<views::AXAuraObjWrapper*>* out_children) override;
+  virtual void Serialize(ui::AXNodeData* out_node_data) override;
+  virtual int32 GetID() override;
 
  private:
   int32 id_;
diff --git a/chrome/browser/ui/ash/accessibility/ax_tree_source_ash.h b/chrome/browser/ui/ash/accessibility/ax_tree_source_ash.h
index f12d133..f326bf2 100644
--- a/chrome/browser/ui/ash/accessibility/ax_tree_source_ash.h
+++ b/chrome/browser/ui/ash/accessibility/ax_tree_source_ash.h
@@ -31,19 +31,19 @@ class AXTreeSourceAsh
   void SetSelection(int32 id, int32 start, int32 end);
 
   // AXTreeSource implementation.
-  virtual views::AXAuraObjWrapper* GetRoot() const OVERRIDE;
-  virtual views::AXAuraObjWrapper* GetFromId(int32 id) const OVERRIDE;
-  virtual int32 GetId(views::AXAuraObjWrapper* node) const OVERRIDE;
+  virtual views::AXAuraObjWrapper* GetRoot() const override;
+  virtual views::AXAuraObjWrapper* GetFromId(int32 id) const override;
+  virtual int32 GetId(views::AXAuraObjWrapper* node) const override;
   virtual void GetChildren(views::AXAuraObjWrapper* node,
-      std::vector<views::AXAuraObjWrapper*>* out_children) const OVERRIDE;
+      std::vector<views::AXAuraObjWrapper*>* out_children) const override;
   virtual views::AXAuraObjWrapper* GetParent(
-      views::AXAuraObjWrapper* node) const OVERRIDE;
-  virtual bool IsValid(views::AXAuraObjWrapper* node) const OVERRIDE;
+      views::AXAuraObjWrapper* node) const override;
+  virtual bool IsValid(views::AXAuraObjWrapper* node) const override;
   virtual bool IsEqual(views::AXAuraObjWrapper* node1,
-                       views::AXAuraObjWrapper* node2) const OVERRIDE;
-  virtual views::AXAuraObjWrapper* GetNull() const OVERRIDE;
+                       views::AXAuraObjWrapper* node2) const override;
+  virtual views::AXAuraObjWrapper* GetNull() const override;
   virtual void SerializeNode(
-      views::AXAuraObjWrapper* node, ui::AXNodeData* out_data) const OVERRIDE;
+      views::AXAuraObjWrapper* node, ui::AXNodeData* out_data) const override;
 
   // Useful for debugging.
   std::string ToString(views::AXAuraObjWrapper* root, std::string prefix);
diff --git a/chrome/browser/ui/ash/accessibility/ax_tree_source_ash_unittest.cc b/chrome/browser/ui/ash/accessibility/ax_tree_source_ash_unittest.cc
index 1911cdd..7931b05 100644
--- a/chrome/browser/ui/ash/accessibility/ax_tree_source_ash_unittest.cc
+++ b/chrome/browser/ui/ash/accessibility/ax_tree_source_ash_unittest.cc
@@ -44,7 +44,7 @@ class AXTreeSourceAshTest : public ash::test::AshTestBase {
   AXTreeSourceAshTest() {}
   virtual ~AXTreeSourceAshTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     AshTestBase::SetUp();
 
     widget_ = new Widget();
diff --git a/chrome/browser/ui/ash/app_list/app_list_controller_ash.h b/chrome/browser/ui/ash/app_list/app_list_controller_ash.h
index 7c0552f..19f842d 100644
--- a/chrome/browser/ui/ash/app_list/app_list_controller_ash.h
+++ b/chrome/browser/ui/ash/app_list/app_list_controller_ash.h
@@ -17,31 +17,31 @@ class AppListControllerDelegateAsh : public AppListControllerDelegate {
 
  private:
   // AppListControllerDelegate overrides:
-  virtual void DismissView() OVERRIDE;
-  virtual gfx::NativeWindow GetAppListWindow() OVERRIDE;
-  virtual gfx::Rect GetAppListBounds() OVERRIDE;
-  virtual gfx::ImageSkia GetWindowIcon() OVERRIDE;
-  virtual bool IsAppPinned(const std::string& extension_id) OVERRIDE;
-  virtual void PinApp(const std::string& extension_id) OVERRIDE;
-  virtual void UnpinApp(const std::string& extension_id) OVERRIDE;
-  virtual Pinnable GetPinnable() OVERRIDE;
-  virtual void OnShowChildDialog() OVERRIDE;
-  virtual void OnCloseChildDialog() OVERRIDE;
-  virtual bool CanDoCreateShortcutsFlow() OVERRIDE;
+  virtual void DismissView() override;
+  virtual gfx::NativeWindow GetAppListWindow() override;
+  virtual gfx::Rect GetAppListBounds() override;
+  virtual gfx::ImageSkia GetWindowIcon() override;
+  virtual bool IsAppPinned(const std::string& extension_id) override;
+  virtual void PinApp(const std::string& extension_id) override;
+  virtual void UnpinApp(const std::string& extension_id) override;
+  virtual Pinnable GetPinnable() override;
+  virtual void OnShowChildDialog() override;
+  virtual void OnCloseChildDialog() override;
+  virtual bool CanDoCreateShortcutsFlow() override;
   virtual void DoCreateShortcutsFlow(Profile* profile,
-                                     const std::string& extension_id) OVERRIDE;
-  virtual void CreateNewWindow(Profile* profile, bool incognito) OVERRIDE;
+                                     const std::string& extension_id) override;
+  virtual void CreateNewWindow(Profile* profile, bool incognito) override;
   virtual void ActivateApp(Profile* profile,
                            const extensions::Extension* extension,
                            AppListSource source,
-                           int event_flags) OVERRIDE;
+                           int event_flags) override;
   virtual void LaunchApp(Profile* profile,
                          const extensions::Extension* extension,
                          AppListSource source,
-                         int event_flags) OVERRIDE;
+                         int event_flags) override;
   virtual void ShowForProfileByPath(
-      const base::FilePath& profile_path) OVERRIDE;
-  virtual bool ShouldShowUserIcon() OVERRIDE;
+      const base::FilePath& profile_path) override;
+  virtual bool ShouldShowUserIcon() override;
 
   ash::LaunchSource AppListSourceToLaunchSource(AppListSource source);
 
diff --git a/chrome/browser/ui/ash/app_list/app_list_service_ash.h b/chrome/browser/ui/ash/app_list/app_list_service_ash.h
index 42ab208..bd115f3 100644
--- a/chrome/browser/ui/ash/app_list/app_list_service_ash.h
+++ b/chrome/browser/ui/ash/app_list/app_list_service_ash.h
@@ -25,19 +25,19 @@ class AppListServiceAsh : public AppListServiceImpl {
 
   // AppListService overrides:
   virtual base::FilePath GetProfilePath(
-      const base::FilePath& user_data_dir) OVERRIDE;
-  virtual void CreateForProfile(Profile* default_profile) OVERRIDE;
-  virtual void ShowForProfile(Profile* default_profile) OVERRIDE;
-  virtual bool IsAppListVisible() const OVERRIDE;
-  virtual void DismissAppList() OVERRIDE;
+      const base::FilePath& user_data_dir) override;
+  virtual void CreateForProfile(Profile* default_profile) override;
+  virtual void ShowForProfile(Profile* default_profile) override;
+  virtual bool IsAppListVisible() const override;
+  virtual void DismissAppList() override;
   virtual void EnableAppList(Profile* initial_profile,
-                             AppListEnableSource enable_source) OVERRIDE;
-  virtual gfx::NativeWindow GetAppListWindow() OVERRIDE;
-  virtual Profile* GetCurrentAppListProfile() OVERRIDE;
-  virtual AppListControllerDelegate* GetControllerDelegate() OVERRIDE;
+                             AppListEnableSource enable_source) override;
+  virtual gfx::NativeWindow GetAppListWindow() override;
+  virtual Profile* GetCurrentAppListProfile() override;
+  virtual AppListControllerDelegate* GetControllerDelegate() override;
 
   // ApplistServiceImpl overrides:
-  virtual void DestroyAppList() OVERRIDE;
+  virtual void DestroyAppList() override;
 
   scoped_ptr<AppListControllerDelegateAsh> controller_delegate_;
 
diff --git a/chrome/browser/ui/ash/app_list/app_sync_ui_state_watcher.h b/chrome/browser/ui/ash/app_list/app_sync_ui_state_watcher.h
index 5ec74a1..28d245c 100644
--- a/chrome/browser/ui/ash/app_list/app_sync_ui_state_watcher.h
+++ b/chrome/browser/ui/ash/app_list/app_sync_ui_state_watcher.h
@@ -25,7 +25,7 @@ class AppSyncUIStateWatcher : public AppSyncUIStateObserver {
 
  private:
   // AppSyncUIStateObserver overrides:
-  virtual void OnAppSyncUIStatusChanged() OVERRIDE;
+  virtual void OnAppSyncUIStatusChanged() override;
 
   AppSyncUIState* app_sync_ui_state_;
   app_list::AppListModel* model_;  // Owned by AppListView
diff --git a/chrome/browser/ui/ash/app_sync_ui_state.h b/chrome/browser/ui/ash/app_sync_ui_state.h
index 7794b28..263e2ef 100644
--- a/chrome/browser/ui/ash/app_sync_ui_state.h
+++ b/chrome/browser/ui/ash/app_sync_ui_state.h
@@ -68,12 +68,12 @@ class AppSyncUIState : public KeyedService,
   void OnMaxSyncingTimer();
 
   // ProfileSyncServiceObserver overrides:
-  virtual void OnStateChanged() OVERRIDE;
+  virtual void OnStateChanged() override;
 
   // extensions::ExtensionRegistryObserver overrides:
   virtual void OnExtensionLoaded(
       content::BrowserContext* browser_context,
-      const extensions::Extension* extension) OVERRIDE;
+      const extensions::Extension* extension) override;
 
   Profile* profile_;
   ProfileSyncService* sync_service_;
diff --git a/chrome/browser/ui/ash/app_sync_ui_state_factory.h b/chrome/browser/ui/ash/app_sync_ui_state_factory.h
index d8bea8f..064c74c 100644
--- a/chrome/browser/ui/ash/app_sync_ui_state_factory.h
+++ b/chrome/browser/ui/ash/app_sync_ui_state_factory.h
@@ -28,7 +28,7 @@ class AppSyncUIStateFactory : public BrowserContextKeyedServiceFactory {
 
   // BrowserContextKeyedServiceFactory overrides:
   virtual KeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* context) const OVERRIDE;
+      content::BrowserContext* context) const override;
 
   DISALLOW_COPY_AND_ASSIGN(AppSyncUIStateFactory);
 };
diff --git a/chrome/browser/ui/ash/ash_keyboard_controller_proxy.h b/chrome/browser/ui/ash/ash_keyboard_controller_proxy.h
index 791d2b8..1a21c6d 100644
--- a/chrome/browser/ui/ash/ash_keyboard_controller_proxy.h
+++ b/chrome/browser/ui/ash/ash_keyboard_controller_proxy.h
@@ -39,13 +39,13 @@ class AshKeyboardControllerProxy
   void OnRequest(const ExtensionHostMsg_Request_Params& params);
 
   // keyboard::KeyboardControllerProxy overrides
-  virtual content::BrowserContext* GetBrowserContext() OVERRIDE;
-  virtual ui::InputMethod* GetInputMethod() OVERRIDE;
+  virtual content::BrowserContext* GetBrowserContext() override;
+  virtual ui::InputMethod* GetInputMethod() override;
   virtual void RequestAudioInput(content::WebContents* web_contents,
       const content::MediaStreamRequest& request,
-      const content::MediaResponseCallback& callback) OVERRIDE;
-  virtual void SetupWebContents(content::WebContents* contents) OVERRIDE;
-  virtual void ShowKeyboardContainer(aura::Window* container) OVERRIDE;
+      const content::MediaResponseCallback& callback) override;
+  virtual void SetupWebContents(content::WebContents* contents) override;
+  virtual void ShowKeyboardContainer(aura::Window* container) override;
 
   // The overridden implementation dispatches
   // chrome.virtualKeyboardPrivate.onTextInputBoxFocused event to extension to
@@ -54,15 +54,15 @@ class AshKeyboardControllerProxy
   // information, but not when the virtual keyboard is used in conjunction with
   // another IME. virtualKeyboardPrivate.onTextInputBoxFocused is the remedy in
   // that case.
-  virtual void SetUpdateInputType(ui::TextInputType type) OVERRIDE;
+  virtual void SetUpdateInputType(ui::TextInputType type) override;
 
   // extensions::ExtensionFunctionDispatcher::Delegate overrides
   virtual extensions::WindowController* GetExtensionWindowController() const
-      OVERRIDE;
-  virtual content::WebContents* GetAssociatedWebContents() const OVERRIDE;
+      override;
+  virtual content::WebContents* GetAssociatedWebContents() const override;
 
   // content::WebContentsObserver overrides
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   scoped_ptr<extensions::ExtensionFunctionDispatcher>
       extension_function_dispatcher_;
diff --git a/chrome/browser/ui/ash/chrome_new_window_delegate.cc b/chrome/browser/ui/ash/chrome_new_window_delegate.cc
index e0d4a53..657fe92 100644
--- a/chrome/browser/ui/ash/chrome_new_window_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_new_window_delegate.cc
@@ -55,15 +55,15 @@ class ChromeNewWindowDelegate::TabRestoreHelper
 
   TabRestoreService* tab_restore_service() { return tab_restore_service_; }
 
-  virtual void TabRestoreServiceChanged(TabRestoreService* service) OVERRIDE {
+  virtual void TabRestoreServiceChanged(TabRestoreService* service) override {
   }
 
-  virtual void TabRestoreServiceDestroyed(TabRestoreService* service) OVERRIDE {
+  virtual void TabRestoreServiceDestroyed(TabRestoreService* service) override {
     // This destroys us.
     delegate_->tab_restore_helper_.reset();
   }
 
-  virtual void TabRestoreServiceLoaded(TabRestoreService* service) OVERRIDE {
+  virtual void TabRestoreServiceLoaded(TabRestoreService* service) override {
     RestoreTabUsingProfile(profile_);
     // This destroys us.
     delegate_->tab_restore_helper_.reset();
diff --git a/chrome/browser/ui/ash/chrome_new_window_delegate.h b/chrome/browser/ui/ash/chrome_new_window_delegate.h
index c055e07..2240706 100644
--- a/chrome/browser/ui/ash/chrome_new_window_delegate.h
+++ b/chrome/browser/ui/ash/chrome_new_window_delegate.h
@@ -17,11 +17,11 @@ class ChromeNewWindowDelegate : public ash::NewWindowDelegate {
   virtual ~ChromeNewWindowDelegate();
 
   // Overridden from ash::NewWindowDelegate:
-  virtual void NewTab() OVERRIDE;
-  virtual void NewWindow(bool incognito) OVERRIDE;
-  virtual void RestoreTab() OVERRIDE;
-  virtual void ShowTaskManager() OVERRIDE;
-  virtual void OpenFeedbackPage() OVERRIDE;
+  virtual void NewTab() override;
+  virtual void NewWindow(bool incognito) override;
+  virtual void RestoreTab() override;
+  virtual void ShowTaskManager() override;
+  virtual void OpenFeedbackPage() override;
 
  private:
   class TabRestoreHelper;
diff --git a/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h b/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h
index 3688e6d..b8a46ba 100644
--- a/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.h
@@ -13,9 +13,9 @@ class ChromeNewWindowDelegateChromeos : public ChromeNewWindowDelegate {
   virtual ~ChromeNewWindowDelegateChromeos();
 
   // Overridden from ash::NewWindowDelegate:
-  virtual void OpenFileManager() OVERRIDE;
-  virtual void OpenCrosh() OVERRIDE;
-  virtual void ShowKeyboardOverlay() OVERRIDE;
+  virtual void OpenFileManager() override;
+  virtual void OpenCrosh() override;
+  virtual void ShowKeyboardOverlay() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromeNewWindowDelegateChromeos);
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.h b/chrome/browser/ui/ash/chrome_shell_delegate.h
index f19bcb3..a0989d9 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.h
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.h
@@ -47,42 +47,42 @@ class ChromeShellDelegate : public ash::ShellDelegate,
   static ChromeShellDelegate* instance() { return instance_; }
 
   // ash::ShellDelegate overrides;
-  virtual bool IsFirstRunAfterBoot() const OVERRIDE;
-  virtual bool IsMultiProfilesEnabled() const OVERRIDE;
-  virtual bool IsIncognitoAllowed() const OVERRIDE;
-  virtual bool IsRunningInForcedAppMode() const OVERRIDE;
-  virtual bool IsMultiAccountEnabled() const OVERRIDE;
-  virtual void PreInit() OVERRIDE;
-  virtual void PreShutdown() OVERRIDE;
-  virtual void Exit() OVERRIDE;
+  virtual bool IsFirstRunAfterBoot() const override;
+  virtual bool IsMultiProfilesEnabled() const override;
+  virtual bool IsIncognitoAllowed() const override;
+  virtual bool IsRunningInForcedAppMode() const override;
+  virtual bool IsMultiAccountEnabled() const override;
+  virtual void PreInit() override;
+  virtual void PreShutdown() override;
+  virtual void Exit() override;
   virtual keyboard::KeyboardControllerProxy*
-      CreateKeyboardControllerProxy() OVERRIDE;
-  virtual void VirtualKeyboardActivated(bool activated) OVERRIDE;
+      CreateKeyboardControllerProxy() override;
+  virtual void VirtualKeyboardActivated(bool activated) override;
   virtual void AddVirtualKeyboardStateObserver(
-      ash::VirtualKeyboardStateObserver* observer) OVERRIDE;
+      ash::VirtualKeyboardStateObserver* observer) override;
   virtual void RemoveVirtualKeyboardStateObserver(
-      ash::VirtualKeyboardStateObserver* observer) OVERRIDE;
-  virtual content::BrowserContext* GetActiveBrowserContext() OVERRIDE;
-  virtual app_list::AppListViewDelegate* GetAppListViewDelegate() OVERRIDE;
+      ash::VirtualKeyboardStateObserver* observer) override;
+  virtual content::BrowserContext* GetActiveBrowserContext() override;
+  virtual app_list::AppListViewDelegate* GetAppListViewDelegate() override;
   virtual ash::ShelfDelegate* CreateShelfDelegate(
-      ash::ShelfModel* model) OVERRIDE;
-  virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() OVERRIDE;
-  virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() OVERRIDE;
-  virtual ash::SessionStateDelegate* CreateSessionStateDelegate() OVERRIDE;
-  virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() OVERRIDE;
-  virtual ash::NewWindowDelegate* CreateNewWindowDelegate() OVERRIDE;
-  virtual ash::MediaDelegate* CreateMediaDelegate() OVERRIDE;
+      ash::ShelfModel* model) override;
+  virtual ash::SystemTrayDelegate* CreateSystemTrayDelegate() override;
+  virtual ash::UserWallpaperDelegate* CreateUserWallpaperDelegate() override;
+  virtual ash::SessionStateDelegate* CreateSessionStateDelegate() override;
+  virtual ash::AccessibilityDelegate* CreateAccessibilityDelegate() override;
+  virtual ash::NewWindowDelegate* CreateNewWindowDelegate() override;
+  virtual ash::MediaDelegate* CreateMediaDelegate() override;
   virtual ui::MenuModel* CreateContextMenu(
       aura::Window* root,
       ash::ShelfItemDelegate* item_delegate,
-      ash::ShelfItem* item) OVERRIDE;
-  virtual ash::GPUSupport* CreateGPUSupport() OVERRIDE;
-  virtual base::string16 GetProductName() const OVERRIDE;
+      ash::ShelfItem* item) override;
+  virtual ash::GPUSupport* CreateGPUSupport() override;
+  virtual base::string16 GetProductName() const override;
 
   // content::NotificationObserver override:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
  private:
   void PlatformInit();
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
index c3dd0b5..09d11ed 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
@@ -68,100 +68,100 @@ class AccessibilityDelegateImpl : public ash::AccessibilityDelegate {
   AccessibilityDelegateImpl() {}
   virtual ~AccessibilityDelegateImpl() {}
 
-  virtual void ToggleHighContrast() OVERRIDE {
+  virtual void ToggleHighContrast() override {
     DCHECK(chromeos::AccessibilityManager::Get());
     chromeos::AccessibilityManager::Get()->EnableHighContrast(
         !chromeos::AccessibilityManager::Get()->IsHighContrastEnabled());
   }
 
-  virtual bool IsSpokenFeedbackEnabled() const OVERRIDE {
+  virtual bool IsSpokenFeedbackEnabled() const override {
     DCHECK(chromeos::AccessibilityManager::Get());
     return chromeos::AccessibilityManager::Get()->IsSpokenFeedbackEnabled();
   }
 
   virtual void ToggleSpokenFeedback(
-      ash::AccessibilityNotificationVisibility notify) OVERRIDE {
+      ash::AccessibilityNotificationVisibility notify) override {
     DCHECK(chromeos::AccessibilityManager::Get());
     chromeos::AccessibilityManager::Get()->ToggleSpokenFeedback(notify);
   }
 
-  virtual bool IsHighContrastEnabled() const OVERRIDE {
+  virtual bool IsHighContrastEnabled() const override {
     DCHECK(chromeos::AccessibilityManager::Get());
     return chromeos::AccessibilityManager::Get()->IsHighContrastEnabled();
   }
 
-  virtual void SetMagnifierEnabled(bool enabled) OVERRIDE {
+  virtual void SetMagnifierEnabled(bool enabled) override {
     DCHECK(chromeos::MagnificationManager::Get());
     return chromeos::MagnificationManager::Get()->SetMagnifierEnabled(enabled);
   }
 
-  virtual void SetMagnifierType(ash::MagnifierType type) OVERRIDE {
+  virtual void SetMagnifierType(ash::MagnifierType type) override {
     DCHECK(chromeos::MagnificationManager::Get());
     return chromeos::MagnificationManager::Get()->SetMagnifierType(type);
   }
 
-  virtual bool IsMagnifierEnabled() const OVERRIDE {
+  virtual bool IsMagnifierEnabled() const override {
     DCHECK(chromeos::MagnificationManager::Get());
     return chromeos::MagnificationManager::Get()->IsMagnifierEnabled();
   }
 
-  virtual ash::MagnifierType GetMagnifierType() const OVERRIDE {
+  virtual ash::MagnifierType GetMagnifierType() const override {
     DCHECK(chromeos::MagnificationManager::Get());
     return chromeos::MagnificationManager::Get()->GetMagnifierType();
   }
 
-  virtual void SetLargeCursorEnabled(bool enabled) OVERRIDE {
+  virtual void SetLargeCursorEnabled(bool enabled) override {
     DCHECK(chromeos::AccessibilityManager::Get());
     return chromeos::AccessibilityManager::Get()->EnableLargeCursor(enabled);
   }
 
-  virtual bool IsLargeCursorEnabled() const OVERRIDE {
+  virtual bool IsLargeCursorEnabled() const override {
     DCHECK(chromeos::AccessibilityManager::Get());
     return chromeos::AccessibilityManager::Get()->IsLargeCursorEnabled();
   }
 
-  virtual void SetAutoclickEnabled(bool enabled) OVERRIDE {
+  virtual void SetAutoclickEnabled(bool enabled) override {
     DCHECK(chromeos::AccessibilityManager::Get());
     return chromeos::AccessibilityManager::Get()->EnableAutoclick(enabled);
   }
 
-  virtual bool IsAutoclickEnabled() const OVERRIDE {
+  virtual bool IsAutoclickEnabled() const override {
     DCHECK(chromeos::AccessibilityManager::Get());
     return chromeos::AccessibilityManager::Get()->IsAutoclickEnabled();
   }
 
-  virtual void SetVirtualKeyboardEnabled(bool enabled) OVERRIDE {
+  virtual void SetVirtualKeyboardEnabled(bool enabled) override {
     DCHECK(chromeos::AccessibilityManager::Get());
     return chromeos::AccessibilityManager::Get()->
         EnableVirtualKeyboard(enabled);
   }
 
-  virtual bool IsVirtualKeyboardEnabled() const OVERRIDE {
+  virtual bool IsVirtualKeyboardEnabled() const override {
     DCHECK(chromeos::AccessibilityManager::Get());
     return chromeos::AccessibilityManager::Get()->IsVirtualKeyboardEnabled();
   }
 
-  virtual bool ShouldShowAccessibilityMenu() const OVERRIDE {
+  virtual bool ShouldShowAccessibilityMenu() const override {
     DCHECK(chromeos::AccessibilityManager::Get());
     return chromeos::AccessibilityManager::Get()->
         ShouldShowAccessibilityMenu();
   }
 
-  virtual bool IsBrailleDisplayConnected() const OVERRIDE {
+  virtual bool IsBrailleDisplayConnected() const override {
     DCHECK(chromeos::AccessibilityManager::Get());
     return chromeos::AccessibilityManager::Get()->IsBrailleDisplayConnected();
   }
 
-  virtual void SilenceSpokenFeedback() const OVERRIDE {
+  virtual void SilenceSpokenFeedback() const override {
     TtsController::GetInstance()->Stop();
   }
 
-  virtual void SaveScreenMagnifierScale(double scale) OVERRIDE {
+  virtual void SaveScreenMagnifierScale(double scale) override {
     if (chromeos::MagnificationManager::Get())
       chromeos::MagnificationManager::Get()->SaveScreenMagnifierScale(scale);
   }
 
-  virtual double GetSavedScreenMagnifierScale() OVERRIDE {
+  virtual double GetSavedScreenMagnifierScale() override {
     if (chromeos::MagnificationManager::Get()) {
       return chromeos::MagnificationManager::Get()->
           GetSavedScreenMagnifierScale();
@@ -170,7 +170,7 @@ class AccessibilityDelegateImpl : public ash::AccessibilityDelegate {
   }
 
   virtual void TriggerAccessibilityAlert(
-      ash::AccessibilityAlert alert) OVERRIDE {
+      ash::AccessibilityAlert alert) override {
     Profile* profile = ProfileManager::GetActiveUserProfile();
     if (profile) {
       switch (alert) {
@@ -195,16 +195,16 @@ class AccessibilityDelegateImpl : public ash::AccessibilityDelegate {
     }
   }
 
-  virtual ash::AccessibilityAlert GetLastAccessibilityAlert() OVERRIDE {
+  virtual ash::AccessibilityAlert GetLastAccessibilityAlert() override {
     return ash::A11Y_ALERT_NONE;
   }
 
-  virtual void PlayEarcon(int sound_key) OVERRIDE {
+  virtual void PlayEarcon(int sound_key) override {
     DCHECK(chromeos::AccessibilityManager::Get());
     return chromeos::AccessibilityManager::Get()->PlayEarcon(sound_key);
   }
 
-  virtual base::TimeDelta PlayShutdownSound() const OVERRIDE {
+  virtual base::TimeDelta PlayShutdownSound() const override {
     return chromeos::AccessibilityManager::Get()->PlayShutdownSound();
   }
 
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
index c9b16cf..c63d4cb 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_views.cc
@@ -50,9 +50,9 @@ class NewWindowDelegateImpl : public ChromeNewWindowDelegate {
   virtual ~NewWindowDelegateImpl() {}
 
   // Overridden from ash::NewWindowDelegate:
-  virtual void OpenFileManager() OVERRIDE {}
-  virtual void OpenCrosh() OVERRIDE {}
-  virtual void ShowKeyboardOverlay() OVERRIDE {}
+  virtual void OpenFileManager() override {}
+  virtual void OpenCrosh() override {}
+  virtual void ShowKeyboardOverlay() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NewWindowDelegateImpl);
@@ -62,11 +62,11 @@ class MediaDelegateImpl : public ash::MediaDelegate {
  public:
   MediaDelegateImpl() {}
   virtual ~MediaDelegateImpl() {}
-  virtual void HandleMediaNextTrack() OVERRIDE {}
-  virtual void HandleMediaPlayPause() OVERRIDE {}
-  virtual void HandleMediaPrevTrack() OVERRIDE {}
+  virtual void HandleMediaNextTrack() override {}
+  virtual void HandleMediaPlayPause() override {}
+  virtual void HandleMediaPrevTrack() override {}
   virtual ash::MediaCaptureState GetMediaCaptureState(
-      content::BrowserContext* context) OVERRIDE {
+      content::BrowserContext* context) override {
     return ash::MEDIA_CAPTURE_NONE;
   }
 
@@ -79,84 +79,84 @@ class EmptyAccessibilityDelegate : public ash::AccessibilityDelegate {
   EmptyAccessibilityDelegate() {}
   virtual ~EmptyAccessibilityDelegate() {}
 
-  virtual void ToggleHighContrast() OVERRIDE {
+  virtual void ToggleHighContrast() override {
   }
 
-  virtual bool IsHighContrastEnabled() const OVERRIDE {
+  virtual bool IsHighContrastEnabled() const override {
     return false;
   }
 
-  virtual bool IsSpokenFeedbackEnabled() const OVERRIDE {
+  virtual bool IsSpokenFeedbackEnabled() const override {
     return false;
   }
 
   virtual void ToggleSpokenFeedback(
-      ash::AccessibilityNotificationVisibility notify) OVERRIDE {
+      ash::AccessibilityNotificationVisibility notify) override {
   }
 
-  virtual void SetLargeCursorEnabled(bool enalbed) OVERRIDE {
+  virtual void SetLargeCursorEnabled(bool enalbed) override {
   }
 
-  virtual bool IsLargeCursorEnabled() const OVERRIDE {
+  virtual bool IsLargeCursorEnabled() const override {
     return false;
   }
 
-  virtual void SetMagnifierEnabled(bool enabled) OVERRIDE {
+  virtual void SetMagnifierEnabled(bool enabled) override {
   }
 
-  virtual void SetMagnifierType(ash::MagnifierType type) OVERRIDE {
+  virtual void SetMagnifierType(ash::MagnifierType type) override {
   }
 
-  virtual bool IsMagnifierEnabled() const OVERRIDE {
+  virtual bool IsMagnifierEnabled() const override {
     return false;
   }
 
-  virtual void SetAutoclickEnabled(bool enabled) OVERRIDE {
+  virtual void SetAutoclickEnabled(bool enabled) override {
   }
 
-  virtual bool IsAutoclickEnabled() const OVERRIDE {
+  virtual bool IsAutoclickEnabled() const override {
     return false;
   }
 
-  virtual ash::MagnifierType GetMagnifierType() const OVERRIDE {
+  virtual ash::MagnifierType GetMagnifierType() const override {
     return ash::kDefaultMagnifierType;
   }
 
-  virtual void SaveScreenMagnifierScale(double scale) OVERRIDE {
+  virtual void SaveScreenMagnifierScale(double scale) override {
   }
 
-  virtual double GetSavedScreenMagnifierScale() OVERRIDE {
+  virtual double GetSavedScreenMagnifierScale() override {
     return std::numeric_limits<double>::min();
   }
 
-  virtual bool ShouldShowAccessibilityMenu() const OVERRIDE {
+  virtual bool ShouldShowAccessibilityMenu() const override {
     return false;
   }
 
-  virtual bool IsBrailleDisplayConnected() const OVERRIDE { return false; }
+  virtual bool IsBrailleDisplayConnected() const override { return false; }
 
-  virtual void SilenceSpokenFeedback() const OVERRIDE {
+  virtual void SilenceSpokenFeedback() const override {
   }
 
-  virtual void SetVirtualKeyboardEnabled(bool enabled) OVERRIDE {
+  virtual void SetVirtualKeyboardEnabled(bool enabled) override {
   }
 
-  virtual bool IsVirtualKeyboardEnabled() const OVERRIDE {
+  virtual bool IsVirtualKeyboardEnabled() const override {
     return false;
   }
 
   virtual void TriggerAccessibilityAlert(
-      ash::AccessibilityAlert alert) OVERRIDE {
+      ash::AccessibilityAlert alert) override {
   }
 
-  virtual ash::AccessibilityAlert GetLastAccessibilityAlert() OVERRIDE {
+  virtual ash::AccessibilityAlert GetLastAccessibilityAlert() override {
     return ash::A11Y_ALERT_NONE;
   }
 
-  virtual void PlayEarcon(int sound_key) OVERRIDE {
+  virtual void PlayEarcon(int sound_key) override {
   }
 
-  virtual base::TimeDelta PlayShutdownSound() const OVERRIDE {
+  virtual base::TimeDelta PlayShutdownSound() const override {
     return base::TimeDelta();
   }
 
diff --git a/chrome/browser/ui/ash/ime_controller_chromeos.h b/chrome/browser/ui/ash/ime_controller_chromeos.h
index 0c0f15d..b12aa28 100644
--- a/chrome/browser/ui/ash/ime_controller_chromeos.h
+++ b/chrome/browser/ui/ash/ime_controller_chromeos.h
@@ -17,11 +17,11 @@ class ImeController : public ash::ImeControlDelegate {
   virtual ~ImeController() {}
 
   // Overridden from ash::ImeControlDelegate:
-  virtual void HandleNextIme() OVERRIDE;
-  virtual bool HandlePreviousIme(const ui::Accelerator& accelerator) OVERRIDE;
-  virtual bool HandleSwitchIme(const ui::Accelerator& accelerator) OVERRIDE;
+  virtual void HandleNextIme() override;
+  virtual bool HandlePreviousIme(const ui::Accelerator& accelerator) override;
+  virtual bool HandleSwitchIme(const ui::Accelerator& accelerator) override;
   virtual ui::Accelerator RemapAccelerator(
-      const ui::Accelerator& accelerator) OVERRIDE;
+      const ui::Accelerator& accelerator) override;
 
  private:
   bool UsingFrenchInputMethod() const;
diff --git a/chrome/browser/ui/ash/ime_controller_chromeos_unittest.cc b/chrome/browser/ui/ash/ime_controller_chromeos_unittest.cc
index 560039e..e47737d 100644
--- a/chrome/browser/ui/ash/ime_controller_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/ime_controller_chromeos_unittest.cc
@@ -17,14 +17,14 @@ class ImeControllerTest : public testing::Test {
   ImeControllerTest() : mock_input_method_manager_(NULL) {}
   virtual ~ImeControllerTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     mock_input_method_manager_ =
         new chromeos::input_method::MockInputMethodManager;
     chromeos::input_method::InitializeForTesting(
         mock_input_method_manager_);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     chromeos::input_method::Shutdown();
     mock_input_method_manager_ = NULL;
   }
diff --git a/chrome/browser/ui/ash/keyboard_controller_browsertest.cc b/chrome/browser/ui/ash/keyboard_controller_browsertest.cc
index 16445c9..074f379 100644
--- a/chrome/browser/ui/ash/keyboard_controller_browsertest.cc
+++ b/chrome/browser/ui/ash/keyboard_controller_browsertest.cc
@@ -23,13 +23,13 @@ class VirtualKeyboardWebContentTest : public InProcessBrowserTest {
   VirtualKeyboardWebContentTest() {};
   virtual ~VirtualKeyboardWebContentTest() {};
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ui::SetUpInputMethodFactoryForTesting();
     InProcessBrowserTest::SetUp();
   }
 
   // Ensure that the virtual keyboard is enabled.
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     command_line->AppendSwitch(
         keyboard::switches::kEnableVirtualKeyboard);
   }
diff --git a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h
index 713701d..68a64f4 100644
--- a/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h
+++ b/chrome/browser/ui/ash/launcher/app_shortcut_launcher_item_controller.h
@@ -37,20 +37,20 @@ class AppShortcutLauncherItemController : public LauncherItemController {
   std::vector<content::WebContents*> GetRunningApplications();
 
   // LauncherItemController overrides:
-  virtual bool IsOpen() const OVERRIDE;
-  virtual bool IsVisible() const OVERRIDE;
-  virtual void Launch(ash::LaunchSource source, int event_flags) OVERRIDE;
-  virtual bool Activate(ash::LaunchSource source) OVERRIDE;
+  virtual bool IsOpen() const override;
+  virtual bool IsVisible() const override;
+  virtual void Launch(ash::LaunchSource source, int event_flags) override;
+  virtual bool Activate(ash::LaunchSource source) override;
   virtual ChromeLauncherAppMenuItems GetApplicationList(
-      int event_flags) OVERRIDE;
-  virtual bool ItemSelected(const ui::Event& event) OVERRIDE;
-  virtual base::string16 GetTitle() OVERRIDE;
+      int event_flags) override;
+  virtual bool ItemSelected(const ui::Event& event) override;
+  virtual base::string16 GetTitle() override;
   virtual ui::MenuModel* CreateContextMenu(
-      aura::Window* root_window) OVERRIDE;
-  virtual ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) OVERRIDE;
-  virtual bool IsDraggable() OVERRIDE;
-  virtual bool ShouldShowTooltip() OVERRIDE;
-  virtual void Close() OVERRIDE;
+      aura::Window* root_window) override;
+  virtual ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) override;
+  virtual bool IsDraggable() override;
+  virtual bool ShouldShowTooltip() override;
+  virtual void Close() override;
 
   // Get the refocus url pattern, which can be used to identify this application
   // from a URL link.
diff --git a/chrome/browser/ui/ash/launcher/app_window_launcher_controller.h b/chrome/browser/ui/ash/launcher/app_window_launcher_controller.h
index 8a8ba69..9fd428d 100644
--- a/chrome/browser/ui/ash/launcher/app_window_launcher_controller.h
+++ b/chrome/browser/ui/ash/launcher/app_window_launcher_controller.h
@@ -51,16 +51,16 @@ class AppWindowLauncherController
 
   // Overridden from AppWindowRegistry::Observer:
   virtual void OnAppWindowIconChanged(
-      extensions::AppWindow* app_window) OVERRIDE;
-  virtual void OnAppWindowShown(extensions::AppWindow* app_window) OVERRIDE;
-  virtual void OnAppWindowHidden(extensions::AppWindow* app_window) OVERRIDE;
+      extensions::AppWindow* app_window) override;
+  virtual void OnAppWindowShown(extensions::AppWindow* app_window) override;
+  virtual void OnAppWindowHidden(extensions::AppWindow* app_window) override;
 
   // Overriden from aura::WindowObserver:
-  virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
+  virtual void OnWindowDestroying(aura::Window* window) override;
 
   // Overriden from client::ActivationChangeObserver:
   virtual void OnWindowActivated(aura::Window* gained_active,
-                                 aura::Window* lost_active) OVERRIDE;
+                                 aura::Window* lost_active) override;
 
  protected:
   // Registers a app window with the shelf and this object.
diff --git a/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h
index ae6dfe7..0e815b2 100644
--- a/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h
+++ b/chrome/browser/ui/ash/launcher/app_window_launcher_item_controller.h
@@ -53,24 +53,24 @@ class AppWindowLauncherItemController : public LauncherItemController,
   const std::string& app_shelf_id() const { return app_shelf_id_; }
 
   // LauncherItemController overrides:
-  virtual bool IsOpen() const OVERRIDE;
-  virtual bool IsVisible() const OVERRIDE;
-  virtual void Launch(ash::LaunchSource source, int event_flags) OVERRIDE;
-  virtual bool Activate(ash::LaunchSource source) OVERRIDE;
+  virtual bool IsOpen() const override;
+  virtual bool IsVisible() const override;
+  virtual void Launch(ash::LaunchSource source, int event_flags) override;
+  virtual bool Activate(ash::LaunchSource source) override;
   virtual ChromeLauncherAppMenuItems GetApplicationList(int event_flags)
-      OVERRIDE;
-  virtual bool ItemSelected(const ui::Event& eent) OVERRIDE;
-  virtual base::string16 GetTitle() OVERRIDE;
-  virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) OVERRIDE;
-  virtual ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) OVERRIDE;
-  virtual bool IsDraggable() OVERRIDE;
-  virtual bool ShouldShowTooltip() OVERRIDE;
-  virtual void Close() OVERRIDE;
+      override;
+  virtual bool ItemSelected(const ui::Event& eent) override;
+  virtual base::string16 GetTitle() override;
+  virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) override;
+  virtual ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) override;
+  virtual bool IsDraggable() override;
+  virtual bool ShouldShowTooltip() override;
+  virtual void Close() override;
 
   // aura::WindowObserver overrides:
   virtual void OnWindowPropertyChanged(aura::Window* window,
                                        const void* key,
-                                       intptr_t old) OVERRIDE;
+                                       intptr_t old) override;
 
   // Get the number of running applications/incarnations of this.
   size_t app_window_count() const { return app_windows_.size(); }
diff --git a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h
index 5f5b39e..9fc7a7f 100644
--- a/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h
+++ b/chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controller.h
@@ -34,20 +34,20 @@ class BrowserShortcutLauncherItemController : public LauncherItemController {
                                           content::WebContents* web_contents);
 
   // LauncherItemController overrides:
-  virtual bool IsOpen() const OVERRIDE;
-  virtual bool IsVisible() const OVERRIDE;
-  virtual void Launch(ash::LaunchSource source, int event_flags) OVERRIDE;
-  virtual bool Activate(ash::LaunchSource source) OVERRIDE;
+  virtual bool IsOpen() const override;
+  virtual bool IsVisible() const override;
+  virtual void Launch(ash::LaunchSource source, int event_flags) override;
+  virtual bool Activate(ash::LaunchSource source) override;
   virtual ChromeLauncherAppMenuItems GetApplicationList(
-      int event_flags) OVERRIDE;
-  virtual bool ItemSelected(const ui::Event& event) OVERRIDE;
-  virtual base::string16 GetTitle() OVERRIDE;
+      int event_flags) override;
+  virtual bool ItemSelected(const ui::Event& event) override;
+  virtual base::string16 GetTitle() override;
   virtual ui::MenuModel* CreateContextMenu(
-      aura::Window* root_window) OVERRIDE;
-  virtual ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) OVERRIDE;
-  virtual bool IsDraggable() OVERRIDE;
-  virtual bool ShouldShowTooltip() OVERRIDE;
-  virtual void Close() OVERRIDE;
+      aura::Window* root_window) override;
+  virtual ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) override;
+  virtual bool IsDraggable() override;
+  virtual bool ShouldShowTooltip() override;
+  virtual void Close() override;
 
  private:
   // Get the favicon for the browser list entry for |web_contents|.
diff --git a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc
index 93f6ef1..22725cc 100644
--- a/chrome/browser/ui/ash/launcher/browser_status_monitor.cc
+++ b/chrome/browser/ui/ash/launcher/browser_status_monitor.cc
@@ -43,7 +43,7 @@ class BrowserStatusMonitor::LocalWebContentsObserver
   // content::WebContentsObserver
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) OVERRIDE {
+      const content::FrameNavigateParams& params) override {
     Browser* browser = chrome::FindBrowserWithWebContents(web_contents());
     ChromeLauncherController::AppState state =
         ChromeLauncherController::APP_STATE_INACTIVE;
@@ -61,7 +61,7 @@ class BrowserStatusMonitor::LocalWebContentsObserver
       monitor_->SetShelfIDForBrowserWindowContents(browser, web_contents());
   }
 
-  virtual void WebContentsDestroyed() OVERRIDE {
+  virtual void WebContentsDestroyed() override {
     // We can only come here when there was a non standard termination like
     // an app got un-installed while running, etc.
     monitor_->WebContentsDestroyed(web_contents());
@@ -83,7 +83,7 @@ class BrowserStatusMonitor::SettingsWindowObserver
   virtual ~SettingsWindowObserver() {}
 
   // SettingsWindowManagerObserver
-  virtual void OnNewSettingsWindow(Browser* settings_browser) OVERRIDE {
+  virtual void OnNewSettingsWindow(Browser* settings_browser) override {
     ash::SetShelfItemDetailsForDialogWindow(
         settings_browser->window()->GetNativeWindow(),
         IDR_ASH_SHELF_ICON_SETTINGS,
diff --git a/chrome/browser/ui/ash/launcher/browser_status_monitor.h b/chrome/browser/ui/ash/launcher/browser_status_monitor.h
index 8b46002..1004dcc 100644
--- a/chrome/browser/ui/ash/launcher/browser_status_monitor.h
+++ b/chrome/browser/ui/ash/launcher/browser_status_monitor.h
@@ -57,36 +57,36 @@ class BrowserStatusMonitor : public aura::client::ActivationChangeObserver,
 
   // aura::client::ActivationChangeObserver overrides:
   virtual void OnWindowActivated(aura::Window* gained_active,
-                                 aura::Window* lost_active) OVERRIDE;
+                                 aura::Window* lost_active) override;
 
   // aura::WindowObserver overrides:
-  virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
+  virtual void OnWindowDestroyed(aura::Window* window) override;
 
   // chrome::BrowserListObserver overrides:
-  virtual void OnBrowserAdded(Browser* browser) OVERRIDE;
-  virtual void OnBrowserRemoved(Browser* browser) OVERRIDE;
+  virtual void OnBrowserAdded(Browser* browser) override;
+  virtual void OnBrowserRemoved(Browser* browser) override;
 
   // gfx::DisplayObserver overrides:
-  virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE;
-  virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE;
+  virtual void OnDisplayAdded(const gfx::Display& new_display) override;
+  virtual void OnDisplayRemoved(const gfx::Display& old_display) override;
   virtual void OnDisplayMetricsChanged(const gfx::Display& display,
-                                       uint32_t metrics) OVERRIDE;
+                                       uint32_t metrics) override;
 
   // TabStripModelObserver overrides:
   virtual void ActiveTabChanged(content::WebContents* old_contents,
                                 content::WebContents* new_contents,
                                 int index,
-                                int reason) OVERRIDE;
+                                int reason) override;
   virtual void TabReplacedAt(TabStripModel* tab_strip_model,
                              content::WebContents* old_contents,
                              content::WebContents* new_contents,
-                             int index) OVERRIDE;
+                             int index) override;
   virtual void TabInsertedAt(content::WebContents* contents,
                              int index,
-                             bool foreground) OVERRIDE;
+                             bool foreground) override;
   virtual void TabClosingAt(TabStripModel* tab_strip_mode,
                             content::WebContents* contents,
-                            int index) OVERRIDE;
+                            int index) override;
 
   // Called from our own |LocalWebContentsObserver| when web contents did go
   // away without any other notification. This might happen in case of
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.h b/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.h
index 293e2c1..34ae91f 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_browser.h
@@ -24,15 +24,15 @@ class ChromeLauncherAppMenuItemBrowser : public content::NotificationObserver,
                                    bool has_leading_separator);
   virtual ~ChromeLauncherAppMenuItemBrowser();
 
-  virtual bool IsActive() const OVERRIDE;
-  virtual bool IsEnabled() const OVERRIDE;
-  virtual void Execute(int event_flags) OVERRIDE;
+  virtual bool IsActive() const override;
+  virtual bool IsEnabled() const override;
+  virtual void Execute(int event_flags) override;
 
  private:
   // content::NotificationObserver.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // The browser which is associated which this item.
   Browser* browser_;
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.h b/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.h
index c40c52c..81d83b4 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_tab.h
@@ -26,9 +26,9 @@ class ChromeLauncherAppMenuItemTab
                                const gfx::Image* icon,
                                content::WebContents* content,
                                bool has_leading_separator);
-  virtual bool IsActive() const OVERRIDE;
-  virtual bool IsEnabled() const OVERRIDE;
-  virtual void Execute(int event_flags) OVERRIDE;
+  virtual bool IsActive() const override;
+  virtual bool IsEnabled() const override;
+  virtual void Execute(int event_flags) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromeLauncherAppMenuItemTab);
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h b/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h
index 775bc43..ef10c05 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_app_menu_item_v2app.h
@@ -27,8 +27,8 @@ class ChromeLauncherAppMenuItemV2App : public ChromeLauncherAppMenuItem {
       ChromeLauncherController* launcher_controller,
       int app_index,
       bool has_leading_separator);
-  virtual bool IsEnabled() const OVERRIDE;
-  virtual void Execute(int event_flags) OVERRIDE;
+  virtual bool IsEnabled() const override;
+  virtual void Execute(int event_flags) override;
 
  private:
   // The owning class which can be used to validate the controller.
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
index ad0323a..34a8f6a 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
@@ -290,12 +290,12 @@ class ChromeLauncherControllerUserSwitchObserverChromeOS
 
   // user_manager::UserManager::UserSessionStateObserver overrides:
   virtual void UserAddedToSession(
-      const user_manager::User* added_user) OVERRIDE;
+      const user_manager::User* added_user) override;
 
   // content::NotificationObserver overrides:
   virtual void Observe(int type,
                const content::NotificationSource& source,
-               const content::NotificationDetails& details) OVERRIDE;
+               const content::NotificationDetails& details) override;
 
  private:
   // Add a user to the session.
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
index 63875f7..2fc099b 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.h
@@ -291,56 +291,56 @@ class ChromeLauncherController : public ash::ShelfDelegate,
                                         bool allow_minimize);
 
   // ash::ShelfDelegate overrides:
-  virtual void OnShelfCreated(ash::Shelf* shelf) OVERRIDE;
-  virtual void OnShelfDestroyed(ash::Shelf* shelf) OVERRIDE;
-  virtual ash::ShelfID GetShelfIDForAppID(const std::string& app_id) OVERRIDE;
-  virtual const std::string& GetAppIDForShelfID(ash::ShelfID id) OVERRIDE;
-  virtual void PinAppWithID(const std::string& app_id) OVERRIDE;
-  virtual bool IsAppPinned(const std::string& app_id) OVERRIDE;
-  virtual bool CanPin() const OVERRIDE;
-  virtual void UnpinAppWithID(const std::string& app_id) OVERRIDE;
+  virtual void OnShelfCreated(ash::Shelf* shelf) override;
+  virtual void OnShelfDestroyed(ash::Shelf* shelf) override;
+  virtual ash::ShelfID GetShelfIDForAppID(const std::string& app_id) override;
+  virtual const std::string& GetAppIDForShelfID(ash::ShelfID id) override;
+  virtual void PinAppWithID(const std::string& app_id) override;
+  virtual bool IsAppPinned(const std::string& app_id) override;
+  virtual bool CanPin() const override;
+  virtual void UnpinAppWithID(const std::string& app_id) override;
 
   // ash::ShelfModelObserver overrides:
-  virtual void ShelfItemAdded(int index) OVERRIDE;
-  virtual void ShelfItemRemoved(int index, ash::ShelfID id) OVERRIDE;
-  virtual void ShelfItemMoved(int start_index, int target_index) OVERRIDE;
+  virtual void ShelfItemAdded(int index) override;
+  virtual void ShelfItemRemoved(int index, ash::ShelfID id) override;
+  virtual void ShelfItemMoved(int start_index, int target_index) override;
   virtual void ShelfItemChanged(int index,
-                                const ash::ShelfItem& old_item) OVERRIDE;
-  virtual void ShelfStatusChanged() OVERRIDE;
+                                const ash::ShelfItem& old_item) override;
+  virtual void ShelfStatusChanged() override;
 
   // ash::ShellObserver overrides:
-  virtual void OnShelfAlignmentChanged(aura::Window* root_window) OVERRIDE;
+  virtual void OnShelfAlignmentChanged(aura::Window* root_window) override;
 
   // ash::DisplayController::Observer overrides:
-  virtual void OnDisplayConfigurationChanged() OVERRIDE;
+  virtual void OnDisplayConfigurationChanged() override;
 
   // ExtensionRegistryObserver overrides:
   virtual void OnExtensionLoaded(
       content::BrowserContext* browser_context,
-      const extensions::Extension* extension) OVERRIDE;
+      const extensions::Extension* extension) override;
   virtual void OnExtensionUnloaded(
       content::BrowserContext* browser_context,
       const extensions::Extension* extension,
-      extensions::UnloadedExtensionInfo::Reason reason) OVERRIDE;
+      extensions::UnloadedExtensionInfo::Reason reason) override;
 
   // PrefServiceSyncableObserver overrides:
-  virtual void OnIsSyncingChanged() OVERRIDE;
+  virtual void OnIsSyncingChanged() override;
 
   // AppSyncUIStateObserver overrides:
-  virtual void OnAppSyncUIStatusChanged() OVERRIDE;
+  virtual void OnAppSyncUIStatusChanged() override;
 
   // ExtensionEnableFlowDelegate overrides:
-  virtual void ExtensionEnableFlowFinished() OVERRIDE;
-  virtual void ExtensionEnableFlowAborted(bool user_initiated) OVERRIDE;
+  virtual void ExtensionEnableFlowFinished() override;
+  virtual void ExtensionEnableFlowAborted(bool user_initiated) override;
 
   // extensions::AppIconLoader overrides:
   virtual void SetAppImage(const std::string& app_id,
-                           const gfx::ImageSkia& image) OVERRIDE;
+                           const gfx::ImageSkia& image) override;
 
   // ash::ShelfLayoutManagerObserver overrides:
   virtual void OnAutoHideBehaviorChanged(
       aura::Window* root_window,
-      ash::ShelfAutoHideBehavior new_behavior) OVERRIDE;
+      ash::ShelfAutoHideBehavior new_behavior) override;
 
   // Called when the active user has changed.
   void ActiveUserChanged(const std::string& user_email);
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
index d80bd02..cd53877 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_browsertest.cc
@@ -94,7 +94,7 @@ class TestAppWindowRegistryObserver
   }
 
   // Overridden from AppWindowRegistry::Observer:
-  virtual void OnAppWindowIconChanged(AppWindow* app_window) OVERRIDE {
+  virtual void OnAppWindowIconChanged(AppWindow* app_window) override {
     ++icon_updates_;
   }
 
@@ -117,7 +117,7 @@ class LauncherPlatformAppBrowserTest
 
   virtual ~LauncherPlatformAppBrowserTest() {}
 
-  virtual void RunTestOnMainThreadLoop() OVERRIDE {
+  virtual void RunTestOnMainThreadLoop() override {
     shelf_ = ash::Shelf::ForPrimaryDisplay();
     controller_ = ChromeLauncherController::instance();
     return extensions::PlatformAppBrowserTest::RunTestOnMainThreadLoop();
@@ -192,7 +192,7 @@ class ShelfAppBrowserTest : public ExtensionBrowserTest {
 
   virtual ~ShelfAppBrowserTest() {}
 
-  virtual void RunTestOnMainThreadLoop() OVERRIDE {
+  virtual void RunTestOnMainThreadLoop() override {
     shelf_ = ash::Shelf::ForPrimaryDisplay();
     model_ = ash::test::ShellTestApi(ash::Shell::GetInstance()).shelf_model();
     controller_ = ChromeLauncherController::instance();
@@ -312,7 +312,7 @@ class ShelfAppBrowserTestNoDefaultBrowser : public ShelfAppBrowserTest {
   ShelfAppBrowserTestNoDefaultBrowser() {}
   virtual ~ShelfAppBrowserTestNoDefaultBrowser() {}
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     ShelfAppBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kNoStartupWindow);
   }
@@ -329,7 +329,7 @@ class ShelfAppBrowserNoMinimizeOnClick : public LauncherPlatformAppBrowserTest {
   ShelfAppBrowserNoMinimizeOnClick() {}
   virtual ~ShelfAppBrowserNoMinimizeOnClick() {}
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     LauncherPlatformAppBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(
         switches::kDisableMinimizeOnSecondLauncherItemClick);
@@ -1735,7 +1735,7 @@ class ShelfAppBrowserTestWithMultiMonitor
   ShelfAppBrowserTestWithMultiMonitor() {}
   virtual ~ShelfAppBrowserTestWithMultiMonitor() {}
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     ShelfAppBrowserTestNoDefaultBrowser::SetUpCommandLine(command_line);
     command_line->AppendSwitchASCII("ash-host-window-bounds",
                                     "800x600,801+0-800x600");
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
index 599c8c2..a8e3c68 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
@@ -98,27 +98,27 @@ class TestShelfModelObserver : public ash::ShelfModelObserver {
   }
 
   // Overridden from ash::ShelfModelObserver:
-  virtual void ShelfItemAdded(int index) OVERRIDE {
+  virtual void ShelfItemAdded(int index) override {
     ++added_;
     last_index_ = index;
   }
 
-  virtual void ShelfItemRemoved(int index, ash::ShelfID id) OVERRIDE {
+  virtual void ShelfItemRemoved(int index, ash::ShelfID id) override {
     ++removed_;
     last_index_ = index;
   }
 
   virtual void ShelfItemChanged(int index,
-                                const ash::ShelfItem& old_item) OVERRIDE {
+                                const ash::ShelfItem& old_item) override {
     ++changed_;
     last_index_ = index;
   }
 
-  virtual void ShelfItemMoved(int start_index, int target_index) OVERRIDE {
+  virtual void ShelfItemMoved(int start_index, int target_index) override {
     last_index_ = target_index;
   }
 
-  virtual void ShelfStatusChanged() OVERRIDE {
+  virtual void ShelfStatusChanged() override {
   }
 
   void clear_counts() {
@@ -152,14 +152,14 @@ class TestAppIconLoaderImpl : public extensions::AppIconLoader {
   }
 
   // AppIconLoader implementation:
-  virtual void FetchImage(const std::string& id) OVERRIDE {
+  virtual void FetchImage(const std::string& id) override {
     ++fetch_count_;
   }
 
-  virtual void ClearImage(const std::string& id) OVERRIDE {
+  virtual void ClearImage(const std::string& id) override {
   }
 
-  virtual void UpdateImage(const std::string& id) OVERRIDE {
+  virtual void UpdateImage(const std::string& id) override {
   }
 
   int fetch_count() const { return fetch_count_; }
@@ -188,12 +188,12 @@ class TestAppTabHelperImpl : public ChromeLauncherController::AppTabHelper {
   }
 
   // AppTabHelper implementation:
-  virtual std::string GetAppID(content::WebContents* tab) OVERRIDE {
+  virtual std::string GetAppID(content::WebContents* tab) override {
     return tab_id_map_.find(tab) != tab_id_map_.end() ? tab_id_map_[tab] :
         std::string();
   }
 
-  virtual bool IsValidIDForCurrentUser(const std::string& id) OVERRIDE {
+  virtual bool IsValidIDForCurrentUser(const std::string& id) override {
     for (TabToStringMap::const_iterator i = tab_id_map_.begin();
          i != tab_id_map_.end(); ++i) {
       if (i->second == id)
@@ -202,7 +202,7 @@ class TestAppTabHelperImpl : public ChromeLauncherController::AppTabHelper {
     return false;
   }
 
-  virtual void SetCurrentUser(Profile* profile) OVERRIDE {
+  virtual void SetCurrentUser(Profile* profile) override {
     // We can ignore this for now.
   }
 
@@ -227,15 +227,15 @@ class TestV2AppLauncherItemController : public LauncherItemController {
   virtual ~TestV2AppLauncherItemController() {}
 
   // Override for LauncherItemController:
-  virtual bool IsOpen() const OVERRIDE { return true; }
-  virtual bool IsVisible() const OVERRIDE { return true; }
-  virtual void Launch(ash::LaunchSource source, int event_flags) OVERRIDE {}
-  virtual bool Activate(ash::LaunchSource source) OVERRIDE { return false; }
-  virtual void Close() OVERRIDE {}
-  virtual bool ItemSelected(const ui::Event& event) OVERRIDE { return false; }
-  virtual base::string16 GetTitle() OVERRIDE { return base::string16(); }
+  virtual bool IsOpen() const override { return true; }
+  virtual bool IsVisible() const override { return true; }
+  virtual void Launch(ash::LaunchSource source, int event_flags) override {}
+  virtual bool Activate(ash::LaunchSource source) override { return false; }
+  virtual void Close() override {}
+  virtual bool ItemSelected(const ui::Event& event) override { return false; }
+  virtual base::string16 GetTitle() override { return base::string16(); }
   virtual ChromeLauncherAppMenuItems GetApplicationList(
-      int event_flags) OVERRIDE {
+      int event_flags) override {
     ChromeLauncherAppMenuItems items;
     items.push_back(
         new ChromeLauncherAppMenuItem(base::string16(), NULL, false));
@@ -243,14 +243,14 @@ class TestV2AppLauncherItemController : public LauncherItemController {
         new ChromeLauncherAppMenuItem(base::string16(), NULL, false));
     return items.Pass();
   }
-  virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) OVERRIDE {
+  virtual ui::MenuModel* CreateContextMenu(aura::Window* root_window) override {
     return NULL;
   }
-  virtual ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) OVERRIDE {
+  virtual ash::ShelfMenuModel* CreateApplicationMenu(int event_flags) override {
     return NULL;
   }
-  virtual bool IsDraggable() OVERRIDE { return false; }
-  virtual bool ShouldShowTooltip() OVERRIDE { return false; }
+  virtual bool IsDraggable() override { return false; }
+  virtual bool ShouldShowTooltip() override { return false; }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestV2AppLauncherItemController);
@@ -272,7 +272,7 @@ class ChromeLauncherControllerTest : public BrowserWithTestWindowTest {
   virtual ~ChromeLauncherControllerTest() {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     BrowserWithTestWindowTest::SetUp();
 
     model_.reset(new ash::ShelfModel);
@@ -411,7 +411,7 @@ class ChromeLauncherControllerTest : public BrowserWithTestWindowTest {
     InsertPrefValue(user_b, 1, extension8_->id());
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     if (!ash::Shell::HasInstance())
       delete item_delegate_manager_;
     model_->RemoveObserver(model_observer_.get());
@@ -630,7 +630,7 @@ class TestBrowserWindowAura : public TestBrowserWindow {
   }
   virtual ~TestBrowserWindowAura() {}
 
-  virtual gfx::NativeWindow GetNativeWindow() OVERRIDE {
+  virtual gfx::NativeWindow GetNativeWindow() override {
     return native_window_.get();
   }
 
@@ -683,7 +683,7 @@ class WebContentsDestroyedWatcher : public content::WebContentsObserver {
 
  private:
   // Overridden WebContentsObserver methods.
-  virtual void WebContentsDestroyed() OVERRIDE {
+  virtual void WebContentsDestroyed() override {
     message_loop_runner_->Quit();
   }
 
@@ -724,7 +724,7 @@ class V1App : public TestBrowserWindow {
   Browser* browser() { return browser_.get(); }
 
   // TestBrowserWindow override:
-  virtual gfx::NativeWindow GetNativeWindow() OVERRIDE {
+  virtual gfx::NativeWindow GetNativeWindow() override {
     return native_window_.get();
   }
 
@@ -781,7 +781,7 @@ class MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest
   }
 
   // Overwrite the Setup function to enable multi profile and needed objects.
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     profile_manager_.reset(
         new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
 
@@ -903,10 +903,10 @@ class MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest
   ash::test::TestShellDelegate* shell_delegate() { return shell_delegate_; }
 
   // Override BrowserWithTestWindowTest:
-  virtual TestingProfile* CreateProfile() OVERRIDE {
+  virtual TestingProfile* CreateProfile() override {
     return CreateMultiUserProfile("user1");
   }
-  virtual void DestroyProfile(TestingProfile* profile) OVERRIDE {
+  virtual void DestroyProfile(TestingProfile* profile) override {
     // Delete the profile through our profile manager.
     ProfileToNameMap::iterator it = created_profiles_.find(profile);
     DCHECK(it != created_profiles_.end());
diff --git a/chrome/browser/ui/ash/launcher/launcher_app_tab_helper.h b/chrome/browser/ui/ash/launcher/launcher_app_tab_helper.h
index 812419d..d4ef078 100644
--- a/chrome/browser/ui/ash/launcher/launcher_app_tab_helper.h
+++ b/chrome/browser/ui/ash/launcher/launcher_app_tab_helper.h
@@ -19,9 +19,9 @@ class LauncherAppTabHelper : public ChromeLauncherController::AppTabHelper {
   virtual ~LauncherAppTabHelper();
 
   // AppTabHelper:
-  virtual std::string GetAppID(content::WebContents* tab) OVERRIDE;
-  virtual bool IsValidIDForCurrentUser(const std::string& id) OVERRIDE;
-  virtual void SetCurrentUser(Profile* profile) OVERRIDE;
+  virtual std::string GetAppID(content::WebContents* tab) override;
+  virtual bool IsValidIDForCurrentUser(const std::string& id) override;
+  virtual void SetCurrentUser(Profile* profile) override;
 
  private:
   Profile* profile_;
diff --git a/chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h b/chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h
index 797e6c0..22f7912 100644
--- a/chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h
+++ b/chrome/browser/ui/ash/launcher/launcher_application_menu_item_model.h
@@ -24,15 +24,15 @@ class LauncherApplicationMenuItemModel : public ash::ShelfMenuModel,
   virtual ~LauncherApplicationMenuItemModel();
 
   // Overridden from ash::ShelfMenuModel:
-  virtual bool IsCommandActive(int command_id) const OVERRIDE;
+  virtual bool IsCommandActive(int command_id) const override;
 
   // Overridden from ui::SimpleMenuModel::Delegate:
-  virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
-  virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
+  virtual bool IsCommandIdChecked(int command_id) const override;
+  virtual bool IsCommandIdEnabled(int command_id) const override;
   virtual bool GetAcceleratorForCommandId(
       int command_id,
-      ui::Accelerator* accelerator) OVERRIDE;
-  virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE;
+      ui::Accelerator* accelerator) override;
+  virtual void ExecuteCommand(int command_id, int event_flags) override;
 
  private:
   void Build();
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu.h b/chrome/browser/ui/ash/launcher/launcher_context_menu.h
index 1e8b716..f0fcdbd 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu.h
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu.h
@@ -53,15 +53,15 @@ class LauncherContextMenu : public ui::SimpleMenuModel,
   ash::ShelfID id() const { return item_.id; }
 
   // ui::SimpleMenuModel::Delegate overrides:
-  virtual bool IsItemForCommandIdDynamic(int command_id) const OVERRIDE;
-  virtual base::string16 GetLabelForCommandId(int command_id) const OVERRIDE;
-  virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
-  virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
-  virtual bool IsCommandIdVisible(int command_id) const OVERRIDE;
+  virtual bool IsItemForCommandIdDynamic(int command_id) const override;
+  virtual base::string16 GetLabelForCommandId(int command_id) const override;
+  virtual bool IsCommandIdChecked(int command_id) const override;
+  virtual bool IsCommandIdEnabled(int command_id) const override;
+  virtual bool IsCommandIdVisible(int command_id) const override;
   virtual bool GetAcceleratorForCommandId(
       int command_id,
-      ui::Accelerator* accelerator) OVERRIDE;
-  virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE;
+      ui::Accelerator* accelerator) override;
+  virtual void ExecuteCommand(int command_id, int event_flags) override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(
diff --git a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
index 04deab8..a262db0 100644
--- a/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_context_menu_unittest.cc
@@ -21,7 +21,7 @@ class TestChromeLauncherController : public ChromeLauncherController {
  public:
   TestChromeLauncherController(Profile* profile, ash::ShelfModel* model)
       : ChromeLauncherController(profile, model) {}
-  virtual bool IsLoggedInAsGuest() OVERRIDE {
+  virtual bool IsLoggedInAsGuest() override {
     return false;
   }
  private:
@@ -38,13 +38,13 @@ class LauncherContextMenuTest : public ash::test::AshTestBase {
   LauncherContextMenuTest()
       : profile_(new TestingProfile()) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ash::test::AshTestBase::SetUp();
     controller_.reset(
         new TestChromeLauncherController(profile(), &shelf_model_));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     controller_.reset(NULL);
     ash::test::AshTestBase::TearDown();
   }
diff --git a/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc b/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc
index b2d22ce..621d7d5b 100644
--- a/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_favicon_loader.cc
@@ -40,7 +40,7 @@ class FaviconRawBitmapHandler : public content::WebContentsObserver {
 
   // content::WebContentObserver implementation.
   virtual void DidUpdateFaviconURL(
-    const std::vector<content::FaviconURL>& candidates) OVERRIDE;
+    const std::vector<content::FaviconURL>& candidates) override;
 
  private:
   void DidDownloadFavicon(
diff --git a/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc b/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc
index ddbe7cf..aafdab0 100644
--- a/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc
+++ b/chrome/browser/ui/ash/launcher/launcher_favicon_loader_browsertest.cc
@@ -40,12 +40,12 @@ class ContentsObserver : public WebContentsObserver {
 
   // WebContentsObserver overrides.
   virtual void DidFinishLoad(content::RenderFrameHost* render_frame_host,
-                             const GURL& validated_url) OVERRIDE {
+                             const GURL& validated_url) override {
     loaded_ = true;
   }
 
   virtual void DidUpdateFaviconURL(
-      const std::vector<content::FaviconURL>& candidates) OVERRIDE {
+      const std::vector<content::FaviconURL>& candidates) override {
     if (!candidates.empty())
       got_favicons_ = true;
   }
@@ -67,7 +67,7 @@ class LauncherFaviconLoaderBrowsertest
   virtual ~LauncherFaviconLoaderBrowsertest() {
   }
 
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     WebContents* web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
     contents_observer_.reset(new ContentsObserver(web_contents));
@@ -75,7 +75,7 @@ class LauncherFaviconLoaderBrowsertest
   }
 
   // LauncherFaviconLoader::Delegate overrides:
-  virtual void FaviconUpdated() OVERRIDE {
+  virtual void FaviconUpdated() override {
     favicon_updated_ = true;
   }
 
diff --git a/chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.h b/chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.h
index 520dd64..6b56d79 100644
--- a/chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.h
+++ b/chrome/browser/ui/ash/launcher/multi_profile_app_window_launcher_controller.h
@@ -17,14 +17,14 @@ class MultiProfileAppWindowLauncherController
   virtual ~MultiProfileAppWindowLauncherController();
 
   // Overridden from AppWindowLauncherController:
-  virtual void ActiveUserChanged(const std::string& user_email) OVERRIDE;
-  virtual void AdditionalUserAddedToSession(Profile* profile) OVERRIDE;
+  virtual void ActiveUserChanged(const std::string& user_email) override;
+  virtual void AdditionalUserAddedToSession(Profile* profile) override;
 
   // Overridden from AppWindowRegistry::Observer:
-  virtual void OnAppWindowAdded(extensions::AppWindow* app_window) OVERRIDE;
-  virtual void OnAppWindowRemoved(extensions::AppWindow* app_window) OVERRIDE;
-  virtual void OnAppWindowShown(extensions::AppWindow* app_window) OVERRIDE;
-  virtual void OnAppWindowHidden(extensions::AppWindow* app_window) OVERRIDE;
+  virtual void OnAppWindowAdded(extensions::AppWindow* app_window) override;
+  virtual void OnAppWindowRemoved(extensions::AppWindow* app_window) override;
+  virtual void OnAppWindowShown(extensions::AppWindow* app_window) override;
+  virtual void OnAppWindowHidden(extensions::AppWindow* app_window) override;
 
  private:
   typedef std::vector<extensions::AppWindow*> AppWindowList;
diff --git a/chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.h b/chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.h
index 2ce371a..47c46a0 100644
--- a/chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.h
+++ b/chrome/browser/ui/ash/launcher/multi_profile_browser_status_monitor.h
@@ -17,9 +17,9 @@ class MultiProfileBrowserStatusMonitor : public BrowserStatusMonitor {
   virtual ~MultiProfileBrowserStatusMonitor();
 
   // BrowserStatusMonitor overrides.
-  virtual void ActiveUserChanged(const std::string& user_email) OVERRIDE;
-  virtual void AddV1AppToShelf(Browser* browser) OVERRIDE;
-  virtual void RemoveV1AppFromShelf(Browser* browser) OVERRIDE;
+  virtual void ActiveUserChanged(const std::string& user_email) override;
+  virtual void AddV1AppToShelf(Browser* browser) override;
+  virtual void RemoveV1AppFromShelf(Browser* browser) override;
 
  private:
   typedef std::vector<Browser*> AppList;
diff --git a/chrome/browser/ui/ash/media_delegate_chromeos.h b/chrome/browser/ui/ash/media_delegate_chromeos.h
index f8d8317..f2fab1e 100644
--- a/chrome/browser/ui/ash/media_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/media_delegate_chromeos.h
@@ -16,17 +16,17 @@ class MediaDelegateChromeOS : public ash::MediaDelegate,
   virtual ~MediaDelegateChromeOS();
 
   // ash::MediaDelegate:
-  virtual void HandleMediaNextTrack() OVERRIDE;
-  virtual void HandleMediaPlayPause() OVERRIDE;
-  virtual void HandleMediaPrevTrack() OVERRIDE;
+  virtual void HandleMediaNextTrack() override;
+  virtual void HandleMediaPlayPause() override;
+  virtual void HandleMediaPrevTrack() override;
   virtual ash::MediaCaptureState GetMediaCaptureState(
-      content::BrowserContext* context) OVERRIDE;
+      content::BrowserContext* context) override;
 
   // MediaCaptureDevicesDispatcher::Observer:
   virtual void OnRequestUpdate(int render_process_id,
                                int render_frame_id,
                                content::MediaStreamType stream_type,
-                               const content::MediaRequestState state) OVERRIDE;
+                               const content::MediaRequestState state) override;
 
  private:
   void NotifyMediaCaptureChange();
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc
index 427699d..e3c3be8 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos.cc
@@ -36,18 +36,18 @@ class MultiUserContextMenuChromeos : public ui::SimpleMenuModel,
   virtual ~MultiUserContextMenuChromeos() {}
 
   // SimpleMenuModel::Delegate:
-  virtual bool IsCommandIdChecked(int command_id) const OVERRIDE {
+  virtual bool IsCommandIdChecked(int command_id) const override {
     return false;
   }
-  virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE {
+  virtual bool IsCommandIdEnabled(int command_id) const override {
     return true;
   }
   virtual bool GetAcceleratorForCommandId(
       int command_id,
-      ui::Accelerator* accelerator) OVERRIDE {
+      ui::Accelerator* accelerator) override {
     return false;
   }
-  virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE;
+  virtual void ExecuteCommand(int command_id, int event_flags) override;
 
  private:
   // The window for which this menu is.
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc
index 47c3312..1cc7f71 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc
@@ -24,8 +24,8 @@ class MultiUserContextMenuChromeOSTest : public AshTestBase {
  public:
   MultiUserContextMenuChromeOSTest() : multi_user_window_manager_(NULL) {}
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
  protected:
   // Set up the test environment for this many windows.
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos.h b/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos.h
index 8c812f0..54f08d5 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos.h
+++ b/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos.h
@@ -26,9 +26,9 @@ class MultiUserNotificationBlockerChromeOS
 
   // message_center::NotificationBlocker overrides:
   virtual bool ShouldShowNotification(
-      const message_center::NotifierId& notifier_id) const OVERRIDE;
+      const message_center::NotifierId& notifier_id) const override;
   virtual bool ShouldShowNotificationAsPopup(
-      const message_center::NotifierId& notifier_id) const OVERRIDE;
+      const message_center::NotifierId& notifier_id) const override;
 
  private:
   // Returns true if this blocker is actively working.
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc
index 79800ef..f11ab98 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc
@@ -27,7 +27,7 @@ class MultiUserNotificationBlockerChromeOSTest
   virtual ~MultiUserNotificationBlockerChromeOSTest() {}
 
   // ash::test::AshTestBase overrides:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ash::test::AshTestBase::SetUp();
     ASSERT_TRUE(testing_profile_manager_.SetUp());
 
@@ -51,7 +51,7 @@ class MultiUserNotificationBlockerChromeOSTest
     GetMultiUserWindowManager()->notification_blocker_->AddObserver(this);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     GetMultiUserWindowManager()->notification_blocker_->RemoveObserver(this);
     if (chrome::MultiUserWindowManager::GetInstance())
       chrome::MultiUserWindowManager::DeleteInstance();
@@ -60,7 +60,7 @@ class MultiUserNotificationBlockerChromeOSTest
 
   // message_center::NotificationBlocker::Observer ovverrides:
   virtual void OnBlockingStateChanged(
-      message_center::NotificationBlocker* blocker) OVERRIDE {
+      message_center::NotificationBlocker* blocker) override {
     state_changed_count_++;
   }
 
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_warning_dialog.cc b/chrome/browser/ui/ash/multi_user/multi_user_warning_dialog.cc
index bb48d42..bb6c485 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_warning_dialog.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_warning_dialog.cc
@@ -37,13 +37,13 @@ class TeleportWarningView : public views::DialogDelegateView {
   static void ShowDialog(const base::Callback<void(bool)>& on_accept);
 
   // views::DialogDelegate overrides.
-  virtual bool Accept() OVERRIDE;
+  virtual bool Accept() override;
 
   // views::WidgetDelegate overrides.
-  virtual ui::ModalType GetModalType() const OVERRIDE;
+  virtual ui::ModalType GetModalType() const override;
 
   // views::View overrides.
-  virtual gfx::Size GetPreferredSize() const OVERRIDE;
+  virtual gfx::Size GetPreferredSize() const override;
 
  private:
   void InitDialog();
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
index 8ada2ec..5fb6f07 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.cc
@@ -194,7 +194,7 @@ class AppObserver : public extensions::AppWindowRegistry::Observer {
   virtual ~AppObserver() {}
 
   // AppWindowRegistry::Observer overrides:
-  virtual void OnAppWindowAdded(extensions::AppWindow* app_window) OVERRIDE {
+  virtual void OnAppWindowAdded(extensions::AppWindow* app_window) override {
     aura::Window* window = app_window->GetNativeWindow();
     DCHECK(window);
     MultiUserWindowManagerChromeOS::GetInstance()->SetWindowOwner(window,
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h
index 55d1618..d378443 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h
@@ -74,43 +74,43 @@ class MultiUserWindowManagerChromeOS
 
   // MultiUserWindowManager overrides:
   virtual void SetWindowOwner(
-      aura::Window* window, const std::string& user_id) OVERRIDE;
+      aura::Window* window, const std::string& user_id) override;
   virtual const std::string& GetWindowOwner(
-      aura::Window* window) const OVERRIDE;
+      aura::Window* window) const override;
   virtual void ShowWindowForUser(
-      aura::Window* window, const std::string& user_id) OVERRIDE;
-  virtual bool AreWindowsSharedAmongUsers() const OVERRIDE;
+      aura::Window* window, const std::string& user_id) override;
+  virtual bool AreWindowsSharedAmongUsers() const override;
   virtual void GetOwnersOfVisibleWindows(
-      std::set<std::string>* user_ids) const OVERRIDE;
+      std::set<std::string>* user_ids) const override;
   virtual bool IsWindowOnDesktopOfUser(
       aura::Window* window,
-      const std::string& user_id) const OVERRIDE;
+      const std::string& user_id) const override;
   virtual const std::string& GetUserPresentingWindow(
-      aura::Window* window) const OVERRIDE;
-  virtual void AddUser(content::BrowserContext* context) OVERRIDE;
-  virtual void AddObserver(Observer* observer) OVERRIDE;
-  virtual void RemoveObserver(Observer* observer) OVERRIDE;
+      aura::Window* window) const override;
+  virtual void AddUser(content::BrowserContext* context) override;
+  virtual void AddObserver(Observer* observer) override;
+  virtual void RemoveObserver(Observer* observer) override;
 
   // SessionStateObserver overrides:
-  virtual void ActiveUserChanged(const std::string& user_id) OVERRIDE;
+  virtual void ActiveUserChanged(const std::string& user_id) override;
 
   // WindowObserver overrides:
-  virtual void OnWindowDestroyed(aura::Window* window) OVERRIDE;
+  virtual void OnWindowDestroyed(aura::Window* window) override;
   virtual void OnWindowVisibilityChanging(aura::Window* window,
-                                          bool visible) OVERRIDE;
+                                          bool visible) override;
   virtual void OnWindowVisibilityChanged(aura::Window* window,
-                                         bool visible) OVERRIDE;
+                                         bool visible) override;
 
   // TransientWindowObserver overrides:
   virtual void OnTransientChildAdded(aura::Window* window,
-                                     aura::Window* transient) OVERRIDE;
+                                     aura::Window* transient) override;
   virtual void OnTransientChildRemoved(aura::Window* window,
-                                       aura::Window* transient) OVERRIDE;
+                                       aura::Window* transient) override;
 
   // content::NotificationObserver overrides:
   virtual void Observe(int type,
                const content::NotificationSource& source,
-               const content::NotificationDetails& details) OVERRIDE;
+               const content::NotificationDetails& details) override;
 
   // Disable any animations for unit tests.
   void SetAnimationSpeedForTest(AnimationSpeed speed);
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
index 4d3d271..5b58d47 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos_unittest.cc
@@ -40,8 +40,8 @@ class MultiUserWindowManagerChromeOSTest : public AshTestBase {
       : multi_user_window_manager_(NULL),
         session_state_delegate_(NULL) {}
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
  protected:
   // Set up the test environment for this many windows.
@@ -1047,7 +1047,7 @@ class TestWindowObserver : public aura::WindowObserver {
 
   virtual void OnWindowBoundsChanged(aura::Window* window,
                                      const gfx::Rect& old_bounds,
-                                     const gfx::Rect& new_bounds) OVERRIDE {
+                                     const gfx::Rect& new_bounds) override {
     resize_calls_++;
   }
 
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_stub.h b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_stub.h
index 0309e57..4a53225 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_window_manager_stub.h
+++ b/chrome/browser/ui/ash/multi_user/multi_user_window_manager_stub.h
@@ -22,22 +22,22 @@ class MultiUserWindowManagerStub : public MultiUserWindowManager {
 
   // MultiUserWindowManager overrides:
   virtual void SetWindowOwner(
-      aura::Window* window, const std::string& user_id) OVERRIDE;
+      aura::Window* window, const std::string& user_id) override;
   virtual const std::string& GetWindowOwner(
-      aura::Window* window) const OVERRIDE;
+      aura::Window* window) const override;
   virtual void ShowWindowForUser(
-      aura::Window* window, const std::string& user_id) OVERRIDE;
-  virtual bool AreWindowsSharedAmongUsers() const OVERRIDE;
+      aura::Window* window, const std::string& user_id) override;
+  virtual bool AreWindowsSharedAmongUsers() const override;
   virtual void GetOwnersOfVisibleWindows(
-      std::set<std::string>* user_ids) const OVERRIDE;
+      std::set<std::string>* user_ids) const override;
   virtual bool IsWindowOnDesktopOfUser(
       aura::Window* window,
-      const std::string& user_id) const OVERRIDE;
+      const std::string& user_id) const override;
   virtual const std::string& GetUserPresentingWindow(
-      aura::Window* window) const OVERRIDE;
-  virtual void AddUser(content::BrowserContext* context) OVERRIDE;
-  virtual void AddObserver(Observer* observer) OVERRIDE;
-  virtual void RemoveObserver(Observer* observer) OVERRIDE;
+      aura::Window* window) const override;
+  virtual void AddUser(content::BrowserContext* context) override;
+  virtual void AddObserver(Observer* observer) override;
+  virtual void RemoveObserver(Observer* observer) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MultiUserWindowManagerStub);
diff --git a/chrome/browser/ui/ash/screenshot_taker.cc b/chrome/browser/ui/ash/screenshot_taker.cc
index 10fd2db..e519e1e 100644
--- a/chrome/browser/ui/ash/screenshot_taker.cc
+++ b/chrome/browser/ui/ash/screenshot_taker.cc
@@ -127,10 +127,10 @@ class ScreenshotTakerNotificationDelegate : public NotificationDelegate {
   }
 
   // Overridden from NotificationDelegate:
-  virtual void Display() OVERRIDE {}
-  virtual void Error() OVERRIDE {}
-  virtual void Close(bool by_user) OVERRIDE {}
-  virtual void Click() OVERRIDE {
+  virtual void Display() override {}
+  virtual void Error() override {}
+  virtual void Close(bool by_user) override {}
+  virtual void Click() override {
     if (!success_)
       return;
 #if defined(OS_CHROMEOS)
@@ -139,7 +139,7 @@ class ScreenshotTakerNotificationDelegate : public NotificationDelegate {
     // TODO(sschmitz): perhaps add similar action for Windows.
 #endif
   }
-  virtual void ButtonClick(int button_index) OVERRIDE {
+  virtual void ButtonClick(int button_index) override {
     DCHECK(success_ && button_index == 0);
 
     // To avoid keeping the screenshot image on memory, it will re-read the
@@ -158,11 +158,11 @@ class ScreenshotTakerNotificationDelegate : public NotificationDelegate {
         FROM_HERE, base::Bind(
             &ReadFileAndCopyToClipboardLocal, screenshot_path_));
   }
-  virtual bool HasClickedListener() OVERRIDE { return success_; }
-  virtual std::string id() const OVERRIDE {
+  virtual bool HasClickedListener() override { return success_; }
+  virtual std::string id() const override {
     return std::string(kNotificationId);
   }
-  virtual content::WebContents* GetWebContents() const OVERRIDE {
+  virtual content::WebContents* GetWebContents() const override {
     return NULL;
   }
 
diff --git a/chrome/browser/ui/ash/screenshot_taker.h b/chrome/browser/ui/ash/screenshot_taker.h
index 1586508..899aee0 100644
--- a/chrome/browser/ui/ash/screenshot_taker.h
+++ b/chrome/browser/ui/ash/screenshot_taker.h
@@ -56,10 +56,10 @@ class ScreenshotTaker : public ash::ScreenshotDelegate {
   virtual ~ScreenshotTaker();
 
   // Overridden from ash::ScreenshotDelegate:
-  virtual void HandleTakeScreenshotForAllRootWindows() OVERRIDE;
+  virtual void HandleTakeScreenshotForAllRootWindows() override;
   virtual void HandleTakePartialScreenshot(aura::Window* window,
-                                           const gfx::Rect& rect) OVERRIDE;
-  virtual bool CanTakeScreenshot() OVERRIDE;
+                                           const gfx::Rect& rect) override;
+  virtual bool CanTakeScreenshot() override;
 
   void ShowNotification(
       ScreenshotTakerObserver::Result screenshot_result,
diff --git a/chrome/browser/ui/ash/screenshot_taker_unittest.cc b/chrome/browser/ui/ash/screenshot_taker_unittest.cc
index 562982f..e49a91f 100644
--- a/chrome/browser/ui/ash/screenshot_taker_unittest.cc
+++ b/chrome/browser/ui/ash/screenshot_taker_unittest.cc
@@ -48,7 +48,7 @@ class ScreenshotTakerTest : public AshTestBase,
   // Overridden from ScreenshotTakerObserver
   virtual void OnScreenshotCompleted(
       ScreenshotTakerObserver::Result screenshot_result,
-      const base::FilePath& screenshot_path) OVERRIDE {
+      const base::FilePath& screenshot_path) override {
     screenshot_complete_ = true;
     screenshot_result_ = screenshot_result;
     screenshot_path_ = screenshot_path;
diff --git a/chrome/browser/ui/ash/session_state_delegate_chromeos.h b/chrome/browser/ui/ash/session_state_delegate_chromeos.h
index a95b4b9..114bcde 100644
--- a/chrome/browser/ui/ash/session_state_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/session_state_delegate_chromeos.h
@@ -28,45 +28,45 @@ class SessionStateDelegateChromeos
 
   // ash::SessionStateDelegate:
   virtual content::BrowserContext* GetBrowserContextByIndex(
-      ash::MultiProfileIndex index) OVERRIDE;
+      ash::MultiProfileIndex index) override;
   virtual content::BrowserContext* GetBrowserContextForWindow(
-      aura::Window* window) OVERRIDE;
-  virtual int GetMaximumNumberOfLoggedInUsers() const OVERRIDE;
-  virtual int NumberOfLoggedInUsers() const OVERRIDE;
-  virtual bool CanAddUserToMultiProfile(AddUserError* error) const OVERRIDE;
-  virtual bool IsActiveUserSessionStarted() const OVERRIDE;
-  virtual bool CanLockScreen() const OVERRIDE;
-  virtual bool IsScreenLocked() const OVERRIDE;
-  virtual bool ShouldLockScreenBeforeSuspending() const OVERRIDE;
-  virtual void LockScreen() OVERRIDE;
-  virtual void UnlockScreen() OVERRIDE;
-  virtual bool IsUserSessionBlocked() const OVERRIDE;
-  virtual SessionState GetSessionState() const OVERRIDE;
+      aura::Window* window) override;
+  virtual int GetMaximumNumberOfLoggedInUsers() const override;
+  virtual int NumberOfLoggedInUsers() const override;
+  virtual bool CanAddUserToMultiProfile(AddUserError* error) const override;
+  virtual bool IsActiveUserSessionStarted() const override;
+  virtual bool CanLockScreen() const override;
+  virtual bool IsScreenLocked() const override;
+  virtual bool ShouldLockScreenBeforeSuspending() const override;
+  virtual void LockScreen() override;
+  virtual void UnlockScreen() override;
+  virtual bool IsUserSessionBlocked() const override;
+  virtual SessionState GetSessionState() const override;
   virtual const user_manager::UserInfo* GetUserInfo(
-      ash::MultiProfileIndex index) const OVERRIDE;
+      ash::MultiProfileIndex index) const override;
   virtual const user_manager::UserInfo* GetUserInfo(
-      content::BrowserContext* context) const OVERRIDE;
-  virtual bool ShouldShowAvatar(aura::Window* window) const OVERRIDE;
-  virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE;
-  virtual void CycleActiveUser(CycleUser cycle_user) OVERRIDE;
-  virtual bool IsMultiProfileAllowedByPrimaryUserPolicy() const OVERRIDE;
+      content::BrowserContext* context) const override;
+  virtual bool ShouldShowAvatar(aura::Window* window) const override;
+  virtual void SwitchActiveUser(const std::string& user_id) override;
+  virtual void CycleActiveUser(CycleUser cycle_user) override;
+  virtual bool IsMultiProfileAllowedByPrimaryUserPolicy() const override;
   virtual void AddSessionStateObserver(
-      ash::SessionStateObserver* observer) OVERRIDE;
+      ash::SessionStateObserver* observer) override;
   virtual void RemoveSessionStateObserver(
-      ash::SessionStateObserver* observer) OVERRIDE;
+      ash::SessionStateObserver* observer) override;
 
   // chromeos::LoginState::Observer overrides.
-  virtual void LoggedInStateChanged() OVERRIDE;
+  virtual void LoggedInStateChanged() override;
 
   // user_manager::UserManager::UserSessionStateObserver:
   virtual void ActiveUserChanged(
-      const user_manager::User* active_user) OVERRIDE;
+      const user_manager::User* active_user) override;
   virtual void UserAddedToSession(
-      const user_manager::User* added_user) OVERRIDE;
+      const user_manager::User* added_user) override;
 
   // chromeos::UserAddingScreen::Observer:
-  virtual void OnUserAddingStarted() OVERRIDE;
-  virtual void OnUserAddingFinished() OVERRIDE;
+  virtual void OnUserAddingStarted() override;
+  virtual void OnUserAddingFinished() override;
 
  private:
   // Sets session state to |new_state|.
diff --git a/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc b/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc
index 4790521..e8883c8 100644
--- a/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc
@@ -50,7 +50,7 @@ class SessionStateDelegateChromeOSTest : public testing::Test {
   virtual ~SessionStateDelegateChromeOSTest() {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     // Initialize the UserManager singleton to a fresh FakeUserManager instance.
     user_manager_ = new chromeos::FakeUserManager;
     user_manager_enabler_.reset(
@@ -61,7 +61,7 @@ class SessionStateDelegateChromeOSTest : public testing::Test {
     testing::Test::SetUp();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     testing::Test::TearDown();
     session_state_delegate_.reset();
     user_manager_enabler_.reset();
diff --git a/chrome/browser/ui/ash/session_state_delegate_views.h b/chrome/browser/ui/ash/session_state_delegate_views.h
index 421d11c..44fc0a9 100644
--- a/chrome/browser/ui/ash/session_state_delegate_views.h
+++ b/chrome/browser/ui/ash/session_state_delegate_views.h
@@ -22,31 +22,31 @@ class SessionStateDelegate : public ash::SessionStateDelegate {
 
   // ash::SessionStateDelegate:
   virtual content::BrowserContext* GetBrowserContextByIndex(
-      ash::MultiProfileIndex index) OVERRIDE;
+      ash::MultiProfileIndex index) override;
   virtual content::BrowserContext* GetBrowserContextForWindow(
-      aura::Window* window) OVERRIDE;
-  virtual int GetMaximumNumberOfLoggedInUsers() const OVERRIDE;
-  virtual int NumberOfLoggedInUsers() const OVERRIDE;
-  virtual bool IsActiveUserSessionStarted() const OVERRIDE;
-  virtual bool CanLockScreen() const OVERRIDE;
-  virtual bool IsScreenLocked() const OVERRIDE;
-  virtual bool ShouldLockScreenBeforeSuspending() const OVERRIDE;
-  virtual void LockScreen() OVERRIDE;
-  virtual void UnlockScreen() OVERRIDE;
-  virtual bool IsUserSessionBlocked() const OVERRIDE;
-  virtual SessionState GetSessionState() const OVERRIDE;
+      aura::Window* window) override;
+  virtual int GetMaximumNumberOfLoggedInUsers() const override;
+  virtual int NumberOfLoggedInUsers() const override;
+  virtual bool IsActiveUserSessionStarted() const override;
+  virtual bool CanLockScreen() const override;
+  virtual bool IsScreenLocked() const override;
+  virtual bool ShouldLockScreenBeforeSuspending() const override;
+  virtual void LockScreen() override;
+  virtual void UnlockScreen() override;
+  virtual bool IsUserSessionBlocked() const override;
+  virtual SessionState GetSessionState() const override;
   virtual const user_manager::UserInfo* GetUserInfo(
-      ash::MultiProfileIndex index) const OVERRIDE;
+      ash::MultiProfileIndex index) const override;
   virtual const user_manager::UserInfo* GetUserInfo(
-      content::BrowserContext* context) const OVERRIDE;
-  virtual bool ShouldShowAvatar(aura::Window* window) const OVERRIDE;
-  virtual void SwitchActiveUser(const std::string& user_id) OVERRIDE;
-  virtual void CycleActiveUser(CycleUser cycle_user) OVERRIDE;
-  virtual bool IsMultiProfileAllowedByPrimaryUserPolicy() const OVERRIDE;
+      content::BrowserContext* context) const override;
+  virtual bool ShouldShowAvatar(aura::Window* window) const override;
+  virtual void SwitchActiveUser(const std::string& user_id) override;
+  virtual void CycleActiveUser(CycleUser cycle_user) override;
+  virtual bool IsMultiProfileAllowedByPrimaryUserPolicy() const override;
   virtual void AddSessionStateObserver(
-      ash::SessionStateObserver* observer) OVERRIDE;
+      ash::SessionStateObserver* observer) override;
   virtual void RemoveSessionStateObserver(
-      ash::SessionStateObserver* observer) OVERRIDE;
+      ash::SessionStateObserver* observer) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SessionStateDelegate);
diff --git a/chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc b/chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc
index 8d322dc..2d3419f 100644
--- a/chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc
+++ b/chrome/browser/ui/ash/solid_color_user_wallpaper_delegate.cc
@@ -25,27 +25,27 @@ class UserWallpaperDelegate : public ash::UserWallpaperDelegate {
   virtual ~UserWallpaperDelegate() {
   }
 
-  virtual int GetAnimationType() OVERRIDE {
+  virtual int GetAnimationType() override {
     return ShouldShowInitialAnimation() ?
         ash::WINDOW_VISIBILITY_ANIMATION_TYPE_BRIGHTNESS_GRAYSCALE :
         static_cast<int>(wm::WINDOW_VISIBILITY_ANIMATION_TYPE_FADE);
   }
 
-  virtual bool ShouldShowInitialAnimation() OVERRIDE {
+  virtual bool ShouldShowInitialAnimation() override {
     return true;
   }
 
-  virtual int GetAnimationDurationOverride() OVERRIDE {
+  virtual int GetAnimationDurationOverride() override {
     // Return 0 to select the default.
     return 0;
   }
 
   virtual void SetAnimationDurationOverride(
-      int animation_duration_in_ms) OVERRIDE {
+      int animation_duration_in_ms) override {
     NOTIMPLEMENTED();
   }
 
-  virtual void UpdateWallpaper(bool clear_cache) OVERRIDE {
+  virtual void UpdateWallpaper(bool clear_cache) override {
     SkBitmap bitmap;
     bitmap.allocN32Pixels(16, 16);
     bitmap.eraseARGB(255, kBackgroundRed, kBackgroundGreen, kBackgroundBlue);
@@ -63,21 +63,21 @@ class UserWallpaperDelegate : public ash::UserWallpaperDelegate {
         ->SetWallpaperImage(wallpaper, ash::WALLPAPER_LAYOUT_TILE);
   }
 
-  virtual void InitializeWallpaper() OVERRIDE {
+  virtual void InitializeWallpaper() override {
     UpdateWallpaper(false);
   }
 
-  virtual void OpenSetWallpaperPage() OVERRIDE {
+  virtual void OpenSetWallpaperPage() override {
   }
 
-  virtual bool CanOpenSetWallpaperPage() OVERRIDE {
+  virtual bool CanOpenSetWallpaperPage() override {
     return false;
   }
 
-  virtual void OnWallpaperAnimationFinished() OVERRIDE {
+  virtual void OnWallpaperAnimationFinished() override {
   }
 
-  virtual void OnWallpaperBootAnimationFinished() OVERRIDE {
+  virtual void OnWallpaperBootAnimationFinished() override {
   }
 
  private:
diff --git a/chrome/browser/ui/ash/stub_user_accounts_delegate.h b/chrome/browser/ui/ash/stub_user_accounts_delegate.h
index 5fbaf74..3adae3c 100644
--- a/chrome/browser/ui/ash/stub_user_accounts_delegate.h
+++ b/chrome/browser/ui/ash/stub_user_accounts_delegate.h
@@ -17,12 +17,12 @@ class StubUserAccountsDelegate : public ash::tray::UserAccountsDelegate {
   void AddAccount(const std::string& account);
 
   // Overridden from ash::tray::UserAccountsDelegate:
-  virtual std::string GetPrimaryAccountId() OVERRIDE;
-  virtual std::vector<std::string> GetSecondaryAccountIds() OVERRIDE;
+  virtual std::string GetPrimaryAccountId() override;
+  virtual std::vector<std::string> GetSecondaryAccountIds() override;
   virtual std::string GetAccountDisplayName(const std::string& account_id)
-      OVERRIDE;
-  virtual void DeleteAccount(const std::string& account_id) OVERRIDE;
-  virtual void LaunchAddAccountDialog() OVERRIDE;
+      override;
+  virtual void DeleteAccount(const std::string& account_id) override;
+  virtual void LaunchAddAccountDialog() override;
 
  private:
   std::string primary_account_;
diff --git a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
index f42e8a9..5507dc4 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/system_tray_delegate_chromeos.h
@@ -55,77 +55,77 @@ class SystemTrayDelegateChromeOS
       scoped_refptr<device::BluetoothAdapter> adapter);
 
   // Overridden from ash::SystemTrayDelegate:
-  virtual void Initialize() OVERRIDE;
-  virtual void Shutdown() OVERRIDE;
-  virtual bool GetTrayVisibilityOnStartup() OVERRIDE;
-  virtual ash::user::LoginStatus GetUserLoginStatus() const OVERRIDE;
-  virtual void ChangeProfilePicture() OVERRIDE;
-  virtual const std::string GetEnterpriseDomain() const OVERRIDE;
-  virtual const base::string16 GetEnterpriseMessage() const OVERRIDE;
-  virtual const std::string GetSupervisedUserManager() const OVERRIDE;
-  virtual const base::string16 GetSupervisedUserManagerName() const OVERRIDE;
-  virtual const base::string16 GetSupervisedUserMessage() const OVERRIDE;
-  virtual bool IsUserSupervised() const OVERRIDE;
-  virtual bool SystemShouldUpgrade() const OVERRIDE;
-  virtual base::HourClockType GetHourClockType() const OVERRIDE;
-  virtual void ShowSettings() OVERRIDE;
-  virtual bool ShouldShowSettings() OVERRIDE;
-  virtual void ShowDateSettings() OVERRIDE;
-  virtual void ShowSetTimeDialog() OVERRIDE;
-  virtual void ShowNetworkSettings(const std::string& service_path) OVERRIDE;
-  virtual void ShowBluetoothSettings() OVERRIDE;
-  virtual void ShowDisplaySettings() OVERRIDE;
-  virtual void ShowChromeSlow() OVERRIDE;
-  virtual bool ShouldShowDisplayNotification() OVERRIDE;
-  virtual void ShowIMESettings() OVERRIDE;
-  virtual void ShowHelp() OVERRIDE;
-  virtual void ShowAccessibilityHelp() OVERRIDE;
-  virtual void ShowAccessibilitySettings() OVERRIDE;
-  virtual void ShowPublicAccountInfo() OVERRIDE;
-  virtual void ShowSupervisedUserInfo() OVERRIDE;
-  virtual void ShowEnterpriseInfo() OVERRIDE;
-  virtual void ShowUserLogin() OVERRIDE;
-  virtual bool ShowSpringChargerReplacementDialog() OVERRIDE;
-  virtual bool IsSpringChargerReplacementDialogVisible() OVERRIDE;
-  virtual bool HasUserConfirmedSafeSpringCharger() OVERRIDE;
-  virtual void ShutDown() OVERRIDE;
-  virtual void SignOut() OVERRIDE;
-  virtual void RequestLockScreen() OVERRIDE;
-  virtual void RequestRestartForUpdate() OVERRIDE;
+  virtual void Initialize() override;
+  virtual void Shutdown() override;
+  virtual bool GetTrayVisibilityOnStartup() override;
+  virtual ash::user::LoginStatus GetUserLoginStatus() const override;
+  virtual void ChangeProfilePicture() override;
+  virtual const std::string GetEnterpriseDomain() const override;
+  virtual const base::string16 GetEnterpriseMessage() const override;
+  virtual const std::string GetSupervisedUserManager() const override;
+  virtual const base::string16 GetSupervisedUserManagerName() const override;
+  virtual const base::string16 GetSupervisedUserMessage() const override;
+  virtual bool IsUserSupervised() const override;
+  virtual bool SystemShouldUpgrade() const override;
+  virtual base::HourClockType GetHourClockType() const override;
+  virtual void ShowSettings() override;
+  virtual bool ShouldShowSettings() override;
+  virtual void ShowDateSettings() override;
+  virtual void ShowSetTimeDialog() override;
+  virtual void ShowNetworkSettings(const std::string& service_path) override;
+  virtual void ShowBluetoothSettings() override;
+  virtual void ShowDisplaySettings() override;
+  virtual void ShowChromeSlow() override;
+  virtual bool ShouldShowDisplayNotification() override;
+  virtual void ShowIMESettings() override;
+  virtual void ShowHelp() override;
+  virtual void ShowAccessibilityHelp() override;
+  virtual void ShowAccessibilitySettings() override;
+  virtual void ShowPublicAccountInfo() override;
+  virtual void ShowSupervisedUserInfo() override;
+  virtual void ShowEnterpriseInfo() override;
+  virtual void ShowUserLogin() override;
+  virtual bool ShowSpringChargerReplacementDialog() override;
+  virtual bool IsSpringChargerReplacementDialogVisible() override;
+  virtual bool HasUserConfirmedSafeSpringCharger() override;
+  virtual void ShutDown() override;
+  virtual void SignOut() override;
+  virtual void RequestLockScreen() override;
+  virtual void RequestRestartForUpdate() override;
   virtual void GetAvailableBluetoothDevices(ash::BluetoothDeviceList* list)
-      OVERRIDE;
-  virtual void BluetoothStartDiscovering() OVERRIDE;
-  virtual void BluetoothStopDiscovering() OVERRIDE;
-  virtual void ConnectToBluetoothDevice(const std::string& address) OVERRIDE;
-  virtual bool IsBluetoothDiscovering() OVERRIDE;
-  virtual void GetCurrentIME(ash::IMEInfo* info) OVERRIDE;
-  virtual void GetAvailableIMEList(ash::IMEInfoList* list) OVERRIDE;
-  virtual void GetCurrentIMEProperties(ash::IMEPropertyInfoList* list) OVERRIDE;
-  virtual void SwitchIME(const std::string& ime_id) OVERRIDE;
-  virtual void ActivateIMEProperty(const std::string& key) OVERRIDE;
-  virtual void ShowNetworkConfigure(const std::string& network_id) OVERRIDE;
-  virtual bool EnrollNetwork(const std::string& network_id) OVERRIDE;
-  virtual void ManageBluetoothDevices() OVERRIDE;
-  virtual void ToggleBluetooth() OVERRIDE;
-  virtual void ShowMobileSimDialog() OVERRIDE;
-  virtual void ShowMobileSetupDialog(const std::string& service_path) OVERRIDE;
-  virtual void ShowOtherNetworkDialog(const std::string& type) OVERRIDE;
-  virtual bool GetBluetoothAvailable() OVERRIDE;
-  virtual bool GetBluetoothEnabled() OVERRIDE;
-  virtual bool GetBluetoothDiscovering() OVERRIDE;
-  virtual void ChangeProxySettings() OVERRIDE;
-  virtual ash::VolumeControlDelegate* GetVolumeControlDelegate() const OVERRIDE;
+      override;
+  virtual void BluetoothStartDiscovering() override;
+  virtual void BluetoothStopDiscovering() override;
+  virtual void ConnectToBluetoothDevice(const std::string& address) override;
+  virtual bool IsBluetoothDiscovering() override;
+  virtual void GetCurrentIME(ash::IMEInfo* info) override;
+  virtual void GetAvailableIMEList(ash::IMEInfoList* list) override;
+  virtual void GetCurrentIMEProperties(ash::IMEPropertyInfoList* list) override;
+  virtual void SwitchIME(const std::string& ime_id) override;
+  virtual void ActivateIMEProperty(const std::string& key) override;
+  virtual void ShowNetworkConfigure(const std::string& network_id) override;
+  virtual bool EnrollNetwork(const std::string& network_id) override;
+  virtual void ManageBluetoothDevices() override;
+  virtual void ToggleBluetooth() override;
+  virtual void ShowMobileSimDialog() override;
+  virtual void ShowMobileSetupDialog(const std::string& service_path) override;
+  virtual void ShowOtherNetworkDialog(const std::string& type) override;
+  virtual bool GetBluetoothAvailable() override;
+  virtual bool GetBluetoothEnabled() override;
+  virtual bool GetBluetoothDiscovering() override;
+  virtual void ChangeProxySettings() override;
+  virtual ash::VolumeControlDelegate* GetVolumeControlDelegate() const override;
   virtual void SetVolumeControlDelegate(
-      scoped_ptr<ash::VolumeControlDelegate> delegate) OVERRIDE;
+      scoped_ptr<ash::VolumeControlDelegate> delegate) override;
   virtual bool GetSessionStartTime(base::TimeTicks* session_start_time)
-      OVERRIDE;
+      override;
   virtual bool GetSessionLengthLimit(base::TimeDelta* session_length_limit)
-      OVERRIDE;
-  virtual int GetSystemTrayMenuWidth() OVERRIDE;
-  virtual void ActiveUserWasChanged() OVERRIDE;
-  virtual bool IsSearchKeyMappedToCapsLock() OVERRIDE;
+      override;
+  virtual int GetSystemTrayMenuWidth() override;
+  virtual void ActiveUserWasChanged() override;
+  virtual bool IsSearchKeyMappedToCapsLock() override;
   virtual ash::tray::UserAccountsDelegate* GetUserAccountsDelegate(
-      const std::string& user_id) OVERRIDE;
+      const std::string& user_id) override;
 
   // browser tests need to call ShouldUse24HourClock().
   bool GetShouldUse24HourClockForTesting() const;
@@ -162,18 +162,18 @@ class SystemTrayDelegateChromeOS
   void NotifyIfLastWindowClosed();
 
   // LoginState::Observer overrides.
-  virtual void LoggedInStateChanged() OVERRIDE;
+  virtual void LoggedInStateChanged() override;
 
   // Overridden from SessionManagerClient::Observer.
-  virtual void ScreenIsLocked() OVERRIDE;
-  virtual void ScreenIsUnlocked() OVERRIDE;
+  virtual void ScreenIsLocked() override;
+  virtual void ScreenIsUnlocked() override;
 
   gfx::NativeWindow GetNativeWindow() const;
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   void OnLanguageRemapSearchKeyToChanged();
 
@@ -184,34 +184,34 @@ class SystemTrayDelegateChromeOS
 
   // Overridden from InputMethodManager::Observer.
   virtual void InputMethodChanged(input_method::InputMethodManager* manager,
-                                  bool show_message) OVERRIDE;
+                                  bool show_message) override;
 
   // Overridden from InputMethodMenuManager::Observer.
   virtual void InputMethodMenuItemChanged(
-      ash::ime::InputMethodMenuManager* manager) OVERRIDE;
+      ash::ime::InputMethodMenuManager* manager) override;
 
   // Overridden from CrasAudioHandler::AudioObserver.
-  virtual void OnOutputVolumeChanged() OVERRIDE;
-  virtual void OnOutputMuteChanged() OVERRIDE;
-  virtual void OnInputGainChanged() OVERRIDE;
-  virtual void OnInputMuteChanged() OVERRIDE;
-  virtual void OnAudioNodesChanged() OVERRIDE;
-  virtual void OnActiveOutputNodeChanged() OVERRIDE;
-  virtual void OnActiveInputNodeChanged() OVERRIDE;
+  virtual void OnOutputVolumeChanged() override;
+  virtual void OnOutputMuteChanged() override;
+  virtual void OnInputGainChanged() override;
+  virtual void OnInputMuteChanged() override;
+  virtual void OnAudioNodesChanged() override;
+  virtual void OnActiveOutputNodeChanged() override;
+  virtual void OnActiveInputNodeChanged() override;
 
   // Overridden from BluetoothAdapter::Observer.
   virtual void AdapterPresentChanged(device::BluetoothAdapter* adapter,
-                                     bool present) OVERRIDE;
+                                     bool present) override;
   virtual void AdapterPoweredChanged(device::BluetoothAdapter* adapter,
-                                     bool powered) OVERRIDE;
+                                     bool powered) override;
   virtual void AdapterDiscoveringChanged(device::BluetoothAdapter* adapter,
-                                         bool discovering) OVERRIDE;
+                                         bool discovering) override;
   virtual void DeviceAdded(device::BluetoothAdapter* adapter,
-                           device::BluetoothDevice* device) OVERRIDE;
+                           device::BluetoothDevice* device) override;
   virtual void DeviceChanged(device::BluetoothAdapter* adapter,
-                             device::BluetoothDevice* device) OVERRIDE;
+                             device::BluetoothDevice* device) override;
   virtual void DeviceRemoved(device::BluetoothAdapter* adapter,
-                             device::BluetoothDevice* device) OVERRIDE;
+                             device::BluetoothDevice* device) override;
 
   void OnStartBluetoothDiscoverySession(
       scoped_ptr<device::BluetoothDiscoverySession> discovery_session);
@@ -219,17 +219,17 @@ class SystemTrayDelegateChromeOS
   void UpdateEnterpriseDomain();
 
   // Overridden from CloudPolicyStore::Observer
-  virtual void OnStoreLoaded(policy::CloudPolicyStore* store) OVERRIDE;
-  virtual void OnStoreError(policy::CloudPolicyStore* store) OVERRIDE;
+  virtual void OnStoreLoaded(policy::CloudPolicyStore* store) override;
+  virtual void OnStoreError(policy::CloudPolicyStore* store) override;
 
   // Overridden from ash::SessionStateObserver
-  virtual void UserAddedToSession(const std::string& user_id) OVERRIDE;
+  virtual void UserAddedToSession(const std::string& user_id) override;
 
   // Overridden from chrome::BrowserListObserver:
-  virtual void OnBrowserRemoved(Browser* browser) OVERRIDE;
+  virtual void OnBrowserRemoved(Browser* browser) override;
 
   // Overridden from extensions::AppWindowRegistry::Observer:
-  virtual void OnAppWindowRemoved(extensions::AppWindow* app_window) OVERRIDE;
+  virtual void OnAppWindowRemoved(extensions::AppWindow* app_window) override;
 
   void OnAccessibilityStatusChanged(
       const AccessibilityStatusEventDetails& details);
diff --git a/chrome/browser/ui/ash/system_tray_delegate_linux.cc b/chrome/browser/ui/ash/system_tray_delegate_linux.cc
index 8c3ee83..826785c 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_linux.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_linux.cc
@@ -45,244 +45,244 @@ class SystemTrayDelegateLinux : public ash::SystemTrayDelegate,
   }
 
   // Overridden from ash::SystemTrayDelegate:
-  virtual void Initialize() OVERRIDE {
+  virtual void Initialize() override {
     UpdateClockType();
   }
 
-  virtual void Shutdown() OVERRIDE {
+  virtual void Shutdown() override {
   }
 
-  virtual bool GetTrayVisibilityOnStartup() OVERRIDE {
+  virtual bool GetTrayVisibilityOnStartup() override {
     return true;
   }
 
-  virtual ash::user::LoginStatus GetUserLoginStatus() const OVERRIDE {
+  virtual ash::user::LoginStatus GetUserLoginStatus() const override {
     return ash::user::LOGGED_IN_OWNER;
   }
 
-  virtual void ChangeProfilePicture() OVERRIDE {
+  virtual void ChangeProfilePicture() override {
   }
 
-  virtual const std::string GetEnterpriseDomain() const OVERRIDE {
+  virtual const std::string GetEnterpriseDomain() const override {
     return std::string();
   }
 
-  virtual const base::string16 GetEnterpriseMessage() const OVERRIDE {
+  virtual const base::string16 GetEnterpriseMessage() const override {
     return base::string16();
   }
 
-  virtual const std::string GetSupervisedUserManager() const OVERRIDE {
+  virtual const std::string GetSupervisedUserManager() const override {
     return std::string();
   }
 
-  virtual const base::string16 GetSupervisedUserManagerName() const OVERRIDE {
+  virtual const base::string16 GetSupervisedUserManagerName() const override {
     return base::string16();
   }
 
-  virtual const base::string16 GetSupervisedUserMessage() const OVERRIDE {
+  virtual const base::string16 GetSupervisedUserMessage() const override {
     return base::string16();
   }
 
-  virtual bool IsUserSupervised() const OVERRIDE {
+  virtual bool IsUserSupervised() const override {
     return false;
   }
 
-  virtual bool SystemShouldUpgrade() const OVERRIDE {
+  virtual bool SystemShouldUpgrade() const override {
     return UpgradeDetector::GetInstance()->notify_upgrade();
   }
 
-  virtual base::HourClockType GetHourClockType() const OVERRIDE {
+  virtual base::HourClockType GetHourClockType() const override {
     return clock_type_;
   }
 
-  virtual void ShowSettings() OVERRIDE {
+  virtual void ShowSettings() override {
   }
 
-  virtual bool ShouldShowSettings() OVERRIDE {
+  virtual bool ShouldShowSettings() override {
     return true;
   }
 
-  virtual void ShowDateSettings() OVERRIDE {
+  virtual void ShowDateSettings() override {
   }
 
-  virtual void ShowSetTimeDialog() OVERRIDE {
+  virtual void ShowSetTimeDialog() override {
   }
 
-  virtual void ShowNetworkSettings(const std::string& service_path) OVERRIDE {
+  virtual void ShowNetworkSettings(const std::string& service_path) override {
   }
 
-  virtual void ShowBluetoothSettings() OVERRIDE {
+  virtual void ShowBluetoothSettings() override {
   }
 
-  virtual void ShowDisplaySettings() OVERRIDE {
+  virtual void ShowDisplaySettings() override {
   }
 
-  virtual void ShowChromeSlow() OVERRIDE {
+  virtual void ShowChromeSlow() override {
     chrome::ScopedTabbedBrowserDisplayer displayer(
         ProfileManager::GetPrimaryUserProfile(), chrome::HOST_DESKTOP_TYPE_ASH);
     chrome::ShowSlow(displayer.browser());
   }
 
-  virtual bool ShouldShowDisplayNotification() OVERRIDE {
+  virtual bool ShouldShowDisplayNotification() override {
     return false;
   }
 
-  virtual void ShowIMESettings() OVERRIDE {
+  virtual void ShowIMESettings() override {
   }
 
-  virtual void ShowHelp() OVERRIDE {
+  virtual void ShowHelp() override {
     chrome::ShowHelpForProfile(
         ProfileManager::GetLastUsedProfile(),
         chrome::HOST_DESKTOP_TYPE_ASH,
         chrome::HELP_SOURCE_MENU);
   }
 
-  virtual void ShowAccessibilityHelp() OVERRIDE {
+  virtual void ShowAccessibilityHelp() override {
   }
 
-  virtual void ShowAccessibilitySettings() OVERRIDE {
+  virtual void ShowAccessibilitySettings() override {
   }
 
-  virtual void ShowPublicAccountInfo() OVERRIDE {
+  virtual void ShowPublicAccountInfo() override {
   }
 
-  virtual void ShowSupervisedUserInfo() OVERRIDE {
+  virtual void ShowSupervisedUserInfo() override {
   }
 
-  virtual void ShowEnterpriseInfo() OVERRIDE {
+  virtual void ShowEnterpriseInfo() override {
   }
 
-  virtual void ShowUserLogin() OVERRIDE {
+  virtual void ShowUserLogin() override {
   }
 
-  virtual bool ShowSpringChargerReplacementDialog() OVERRIDE {
+  virtual bool ShowSpringChargerReplacementDialog() override {
     return false;
   }
 
-  virtual bool IsSpringChargerReplacementDialogVisible() OVERRIDE {
+  virtual bool IsSpringChargerReplacementDialogVisible() override {
     return false;
   }
 
-  virtual bool HasUserConfirmedSafeSpringCharger() OVERRIDE {
+  virtual bool HasUserConfirmedSafeSpringCharger() override {
     return false;
   }
 
-  virtual void ShutDown() OVERRIDE {
+  virtual void ShutDown() override {
   }
 
-  virtual void SignOut() OVERRIDE {
+  virtual void SignOut() override {
   }
 
-  virtual void RequestLockScreen() OVERRIDE {
+  virtual void RequestLockScreen() override {
   }
 
-  virtual void RequestRestartForUpdate() OVERRIDE {
+  virtual void RequestRestartForUpdate() override {
     chrome::AttemptRestart();
   }
 
   virtual void GetAvailableBluetoothDevices(
-      ash::BluetoothDeviceList* list) OVERRIDE {
+      ash::BluetoothDeviceList* list) override {
   }
 
-  virtual void BluetoothStartDiscovering() OVERRIDE {
+  virtual void BluetoothStartDiscovering() override {
   }
 
-  virtual void BluetoothStopDiscovering() OVERRIDE {
+  virtual void BluetoothStopDiscovering() override {
   }
 
-  virtual void ConnectToBluetoothDevice(const std::string& address) OVERRIDE {
+  virtual void ConnectToBluetoothDevice(const std::string& address) override {
   }
 
-  virtual bool IsBluetoothDiscovering() OVERRIDE {
+  virtual bool IsBluetoothDiscovering() override {
     return false;
   }
 
-  virtual void GetCurrentIME(ash::IMEInfo* info) OVERRIDE {
+  virtual void GetCurrentIME(ash::IMEInfo* info) override {
   }
 
-  virtual void GetAvailableIMEList(ash::IMEInfoList* list) OVERRIDE {
+  virtual void GetAvailableIMEList(ash::IMEInfoList* list) override {
   }
 
   virtual void GetCurrentIMEProperties(
-      ash::IMEPropertyInfoList* list) OVERRIDE {
+      ash::IMEPropertyInfoList* list) override {
   }
 
-  virtual void SwitchIME(const std::string& ime_id) OVERRIDE {
+  virtual void SwitchIME(const std::string& ime_id) override {
   }
 
-  virtual void ActivateIMEProperty(const std::string& key) OVERRIDE {
+  virtual void ActivateIMEProperty(const std::string& key) override {
   }
 
-  virtual void ShowNetworkConfigure(const std::string& network_id) OVERRIDE {
+  virtual void ShowNetworkConfigure(const std::string& network_id) override {
   }
 
-  virtual bool EnrollNetwork(const std::string& network_id) OVERRIDE {
+  virtual bool EnrollNetwork(const std::string& network_id) override {
     return true;
   }
 
-  virtual void ManageBluetoothDevices() OVERRIDE {
+  virtual void ManageBluetoothDevices() override {
   }
 
-  virtual void ToggleBluetooth() OVERRIDE {
+  virtual void ToggleBluetooth() override {
   }
 
-  virtual void ShowMobileSimDialog() OVERRIDE {
+  virtual void ShowMobileSimDialog() override {
   }
 
-  virtual void ShowMobileSetupDialog(const std::string& service_path) OVERRIDE {
+  virtual void ShowMobileSetupDialog(const std::string& service_path) override {
   }
 
-  virtual void ShowOtherNetworkDialog(const std::string& type) OVERRIDE {
+  virtual void ShowOtherNetworkDialog(const std::string& type) override {
   }
 
-  virtual bool GetBluetoothAvailable() OVERRIDE {
+  virtual bool GetBluetoothAvailable() override {
     return false;
   }
 
-  virtual bool GetBluetoothEnabled() OVERRIDE {
+  virtual bool GetBluetoothEnabled() override {
     return false;
   }
 
-  virtual bool GetBluetoothDiscovering() OVERRIDE {
+  virtual bool GetBluetoothDiscovering() override {
     return false;
   }
 
-  virtual void ChangeProxySettings() OVERRIDE {
+  virtual void ChangeProxySettings() override {
   }
 
   virtual ash::VolumeControlDelegate*
-  GetVolumeControlDelegate() const OVERRIDE {
+  GetVolumeControlDelegate() const override {
     return NULL;
   }
 
   virtual void SetVolumeControlDelegate(
-      scoped_ptr<ash::VolumeControlDelegate> delegate) OVERRIDE {
+      scoped_ptr<ash::VolumeControlDelegate> delegate) override {
   }
 
   virtual bool GetSessionStartTime(
-      base::TimeTicks* session_start_time) OVERRIDE {
+      base::TimeTicks* session_start_time) override {
     return false;
   }
 
   virtual bool GetSessionLengthLimit(
-      base::TimeDelta* session_length_limit) OVERRIDE {
+      base::TimeDelta* session_length_limit) override {
     return false;
   }
 
-  virtual int GetSystemTrayMenuWidth() OVERRIDE {
+  virtual int GetSystemTrayMenuWidth() override {
     return l10n_util::GetLocalizedContentsWidthInPixels(
         IDS_SYSTEM_TRAY_MENU_BUBBLE_WIDTH_PIXELS);
   }
 
-  virtual void ActiveUserWasChanged() OVERRIDE {
+  virtual void ActiveUserWasChanged() override {
   }
 
-  virtual bool IsSearchKeyMappedToCapsLock() OVERRIDE {
+  virtual bool IsSearchKeyMappedToCapsLock() override {
     return false;
   }
 
   virtual ash::tray::UserAccountsDelegate* GetUserAccountsDelegate(
-      const std::string& user_id) OVERRIDE {
+      const std::string& user_id) override {
     return NULL;
   }
 
@@ -300,7 +300,7 @@ class SystemTrayDelegateLinux : public ash::SystemTrayDelegate,
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE {
+                       const content::NotificationDetails& details) override {
     if (type == chrome::NOTIFICATION_UPGRADE_RECOMMENDED) {
         UpgradeDetector* detector =
             content::Source<UpgradeDetector>(source).ptr();
diff --git a/chrome/browser/ui/ash/system_tray_delegate_win.cc b/chrome/browser/ui/ash/system_tray_delegate_win.cc
index 47e7621..01d21d6 100644
--- a/chrome/browser/ui/ash/system_tray_delegate_win.cc
+++ b/chrome/browser/ui/ash/system_tray_delegate_win.cc
@@ -45,241 +45,241 @@ class SystemTrayDelegateWin : public ash::SystemTrayDelegate,
   }
 
   // Overridden from ash::SystemTrayDelegate:
-  virtual void Initialize() OVERRIDE {
+  virtual void Initialize() override {
     UpdateClockType();
   }
 
-  virtual void Shutdown() OVERRIDE {
+  virtual void Shutdown() override {
   }
 
-  virtual bool GetTrayVisibilityOnStartup() OVERRIDE {
+  virtual bool GetTrayVisibilityOnStartup() override {
     return true;
   }
 
-  virtual ash::user::LoginStatus GetUserLoginStatus() const OVERRIDE {
+  virtual ash::user::LoginStatus GetUserLoginStatus() const override {
     return ash::user::LOGGED_IN_OWNER;
   }
 
-  virtual void ChangeProfilePicture() OVERRIDE {
+  virtual void ChangeProfilePicture() override {
   }
 
-  virtual const std::string GetEnterpriseDomain() const OVERRIDE {
+  virtual const std::string GetEnterpriseDomain() const override {
     return std::string();
   }
 
-  virtual const base::string16 GetEnterpriseMessage() const OVERRIDE {
+  virtual const base::string16 GetEnterpriseMessage() const override {
     return base::string16();
   }
 
-  virtual const std::string GetSupervisedUserManager() const OVERRIDE {
+  virtual const std::string GetSupervisedUserManager() const override {
     return std::string();
   }
 
-  virtual const base::string16 GetSupervisedUserManagerName() const OVERRIDE {
+  virtual const base::string16 GetSupervisedUserManagerName() const override {
     return base::string16();
   }
 
-  virtual const base::string16 GetSupervisedUserMessage() const OVERRIDE {
+  virtual const base::string16 GetSupervisedUserMessage() const override {
     return base::string16();
   }
 
-  virtual bool IsUserSupervised() const OVERRIDE {
+  virtual bool IsUserSupervised() const override {
     return false;
   }
 
-  virtual bool SystemShouldUpgrade() const OVERRIDE {
+  virtual bool SystemShouldUpgrade() const override {
     return UpgradeDetector::GetInstance()->notify_upgrade();
   }
 
-  virtual base::HourClockType GetHourClockType() const OVERRIDE {
+  virtual base::HourClockType GetHourClockType() const override {
     return clock_type_;
   }
 
-  virtual void ShowSettings() OVERRIDE {
+  virtual void ShowSettings() override {
   }
 
-  virtual bool ShouldShowSettings() OVERRIDE {
+  virtual bool ShouldShowSettings() override {
     return true;
   }
 
-  virtual void ShowDateSettings() OVERRIDE {
+  virtual void ShowDateSettings() override {
   }
 
-  virtual void ShowSetTimeDialog() OVERRIDE {
+  virtual void ShowSetTimeDialog() override {
   }
 
-  virtual void ShowNetworkSettings(const std::string& service_path) OVERRIDE {
+  virtual void ShowNetworkSettings(const std::string& service_path) override {
   }
 
-  virtual void ShowBluetoothSettings() OVERRIDE {
+  virtual void ShowBluetoothSettings() override {
   }
 
-  virtual void ShowDisplaySettings() OVERRIDE {
+  virtual void ShowDisplaySettings() override {
   }
 
-  virtual void ShowChromeSlow() OVERRIDE {
+  virtual void ShowChromeSlow() override {
   }
 
-  virtual bool ShouldShowDisplayNotification() OVERRIDE {
+  virtual bool ShouldShowDisplayNotification() override {
     return false;
   }
 
-  virtual void ShowIMESettings() OVERRIDE {
+  virtual void ShowIMESettings() override {
   }
 
-  virtual void ShowHelp() OVERRIDE {
+  virtual void ShowHelp() override {
     chrome::ShowHelpForProfile(
         ProfileManager::GetLastUsedProfile(),
         chrome::HOST_DESKTOP_TYPE_ASH,
         chrome::HELP_SOURCE_MENU);
   }
 
-  virtual void ShowAccessibilityHelp() OVERRIDE {
+  virtual void ShowAccessibilityHelp() override {
   }
 
-  virtual void ShowAccessibilitySettings() OVERRIDE {
+  virtual void ShowAccessibilitySettings() override {
   }
 
-  virtual void ShowPublicAccountInfo() OVERRIDE {
+  virtual void ShowPublicAccountInfo() override {
   }
 
-  virtual void ShowSupervisedUserInfo() OVERRIDE {
+  virtual void ShowSupervisedUserInfo() override {
   }
 
-  virtual void ShowEnterpriseInfo() OVERRIDE {
+  virtual void ShowEnterpriseInfo() override {
   }
 
-  virtual void ShowUserLogin() OVERRIDE {
+  virtual void ShowUserLogin() override {
   }
 
-  virtual bool ShowSpringChargerReplacementDialog() OVERRIDE {
+  virtual bool ShowSpringChargerReplacementDialog() override {
     return false;
   }
 
-  virtual bool IsSpringChargerReplacementDialogVisible() OVERRIDE {
+  virtual bool IsSpringChargerReplacementDialogVisible() override {
     return false;
   }
 
-  virtual bool HasUserConfirmedSafeSpringCharger() OVERRIDE {
+  virtual bool HasUserConfirmedSafeSpringCharger() override {
     return false;
   }
 
-  virtual void ShutDown() OVERRIDE {
+  virtual void ShutDown() override {
   }
 
-  virtual void SignOut() OVERRIDE {
+  virtual void SignOut() override {
   }
 
-  virtual void RequestLockScreen() OVERRIDE {
+  virtual void RequestLockScreen() override {
   }
 
-  virtual void RequestRestartForUpdate() OVERRIDE {
+  virtual void RequestRestartForUpdate() override {
     chrome::AttemptRestart();
   }
 
   virtual void GetAvailableBluetoothDevices(
-      ash::BluetoothDeviceList* list) OVERRIDE {
+      ash::BluetoothDeviceList* list) override {
   }
 
-  virtual void BluetoothStartDiscovering() OVERRIDE {
+  virtual void BluetoothStartDiscovering() override {
   }
 
-  virtual void BluetoothStopDiscovering() OVERRIDE {
+  virtual void BluetoothStopDiscovering() override {
   }
 
-  virtual void ConnectToBluetoothDevice(const std::string& address) OVERRIDE {
+  virtual void ConnectToBluetoothDevice(const std::string& address) override {
   }
 
-  virtual bool IsBluetoothDiscovering() OVERRIDE {
+  virtual bool IsBluetoothDiscovering() override {
     return false;
   }
 
-  virtual void GetCurrentIME(ash::IMEInfo* info) OVERRIDE {
+  virtual void GetCurrentIME(ash::IMEInfo* info) override {
   }
 
-  virtual void GetAvailableIMEList(ash::IMEInfoList* list) OVERRIDE {
+  virtual void GetAvailableIMEList(ash::IMEInfoList* list) override {
   }
 
   virtual void GetCurrentIMEProperties(
-      ash::IMEPropertyInfoList* list) OVERRIDE {
+      ash::IMEPropertyInfoList* list) override {
   }
 
-  virtual void SwitchIME(const std::string& ime_id) OVERRIDE {
+  virtual void SwitchIME(const std::string& ime_id) override {
   }
 
-  virtual void ActivateIMEProperty(const std::string& key) OVERRIDE {
+  virtual void ActivateIMEProperty(const std::string& key) override {
   }
 
-  virtual void ShowNetworkConfigure(const std::string& network_id) OVERRIDE {
+  virtual void ShowNetworkConfigure(const std::string& network_id) override {
   }
 
-  virtual bool EnrollNetwork(const std::string& network_id) OVERRIDE {
+  virtual bool EnrollNetwork(const std::string& network_id) override {
     return true;
   }
 
-  virtual void ManageBluetoothDevices() OVERRIDE {
+  virtual void ManageBluetoothDevices() override {
   }
 
-  virtual void ToggleBluetooth() OVERRIDE {
+  virtual void ToggleBluetooth() override {
   }
 
-  virtual void ShowMobileSimDialog() OVERRIDE {
+  virtual void ShowMobileSimDialog() override {
   }
 
-  virtual void ShowMobileSetupDialog(const std::string& service_path) OVERRIDE {
+  virtual void ShowMobileSetupDialog(const std::string& service_path) override {
   }
 
-  virtual void ShowOtherNetworkDialog(const std::string& type) OVERRIDE {
+  virtual void ShowOtherNetworkDialog(const std::string& type) override {
   }
 
-  virtual bool GetBluetoothAvailable() OVERRIDE {
+  virtual bool GetBluetoothAvailable() override {
     return false;
   }
 
-  virtual bool GetBluetoothEnabled() OVERRIDE {
+  virtual bool GetBluetoothEnabled() override {
     return false;
   }
 
-  virtual bool GetBluetoothDiscovering() OVERRIDE {
+  virtual bool GetBluetoothDiscovering() override {
     return false;
   }
 
-  virtual void ChangeProxySettings() OVERRIDE {
+  virtual void ChangeProxySettings() override {
   }
 
   virtual ash::VolumeControlDelegate*
-  GetVolumeControlDelegate() const OVERRIDE {
+  GetVolumeControlDelegate() const override {
     return NULL;
   }
 
   virtual void SetVolumeControlDelegate(
-      scoped_ptr<ash::VolumeControlDelegate> delegate) OVERRIDE {
+      scoped_ptr<ash::VolumeControlDelegate> delegate) override {
   }
 
   virtual bool GetSessionStartTime(
-      base::TimeTicks* session_start_time) OVERRIDE {
+      base::TimeTicks* session_start_time) override {
     return false;
   }
 
   virtual bool GetSessionLengthLimit(
-      base::TimeDelta* session_length_limit) OVERRIDE {
+      base::TimeDelta* session_length_limit) override {
     return false;
   }
 
-  virtual int GetSystemTrayMenuWidth() OVERRIDE {
+  virtual int GetSystemTrayMenuWidth() override {
     return l10n_util::GetLocalizedContentsWidthInPixels(
         IDS_SYSTEM_TRAY_MENU_BUBBLE_WIDTH_PIXELS);
   }
 
-  virtual void ActiveUserWasChanged() OVERRIDE {
+  virtual void ActiveUserWasChanged() override {
   }
 
-  virtual bool IsSearchKeyMappedToCapsLock() OVERRIDE {
+  virtual bool IsSearchKeyMappedToCapsLock() override {
     return false;
   }
 
   virtual ash::tray::UserAccountsDelegate* GetUserAccountsDelegate(
-      const std::string& user_id) OVERRIDE {
+      const std::string& user_id) override {
     return NULL;
   }
 
@@ -297,7 +297,7 @@ class SystemTrayDelegateWin : public ash::SystemTrayDelegate,
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE {
+                       const content::NotificationDetails& details) override {
     if (type == chrome::NOTIFICATION_UPGRADE_RECOMMENDED) {
         UpgradeDetector* detector =
             content::Source<UpgradeDetector>(source).ptr();
diff --git a/chrome/browser/ui/ash/user_accounts_delegate_chromeos.h b/chrome/browser/ui/ash/user_accounts_delegate_chromeos.h
index 6a0dd5d..41ef5f6 100644
--- a/chrome/browser/ui/ash/user_accounts_delegate_chromeos.h
+++ b/chrome/browser/ui/ash/user_accounts_delegate_chromeos.h
@@ -21,16 +21,16 @@ class UserAccountsDelegateChromeOS : public ash::tray::UserAccountsDelegate,
   virtual ~UserAccountsDelegateChromeOS();
 
   // Overridden from ash::tray::UserAccountsDelegate:
-  virtual std::string GetPrimaryAccountId() OVERRIDE;
-  virtual std::vector<std::string> GetSecondaryAccountIds() OVERRIDE;
+  virtual std::string GetPrimaryAccountId() override;
+  virtual std::vector<std::string> GetSecondaryAccountIds() override;
   virtual std::string GetAccountDisplayName(
-      const std::string& account_id) OVERRIDE;
-  virtual void DeleteAccount(const std::string& account_id) OVERRIDE;
-  virtual void LaunchAddAccountDialog() OVERRIDE;
+      const std::string& account_id) override;
+  virtual void DeleteAccount(const std::string& account_id) override;
+  virtual void LaunchAddAccountDialog() override;
 
   // Overridden from OAuth2TokenServiceObserver:
-  virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE;
-  virtual void OnRefreshTokenRevoked(const std::string& account_id) OVERRIDE;
+  virtual void OnRefreshTokenAvailable(const std::string& account_id) override;
+  virtual void OnRefreshTokenRevoked(const std::string& account_id) override;
 
  private:
   Profile* user_profile_;
diff --git a/chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc b/chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc
index 40004c2..f6bc1d6 100644
--- a/chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc
+++ b/chrome/browser/ui/ash/volume_controller_browsertest_chromeos.cc
@@ -30,17 +30,17 @@ class SoundsManagerTestImpl : public media::SoundsManager {
   virtual ~SoundsManagerTestImpl() {}
 
   virtual bool Initialize(SoundKey key,
-                          const base::StringPiece& /* data */) OVERRIDE {
+                          const base::StringPiece& /* data */) override {
     is_sound_initialized_[key] = true;
     return true;
   }
 
-  virtual bool Play(SoundKey key) OVERRIDE {
+  virtual bool Play(SoundKey key) override {
     ++num_play_requests_[key];
     return true;
   }
 
-  virtual base::TimeDelta GetDuration(SoundKey /* key */) OVERRIDE {
+  virtual base::TimeDelta GetDuration(SoundKey /* key */) override {
     return base::TimeDelta();
   }
 
@@ -64,7 +64,7 @@ class VolumeControllerTest : public InProcessBrowserTest {
   VolumeControllerTest() {}
   virtual ~VolumeControllerTest() {}
 
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     volume_controller_.reset(new VolumeController());
     audio_handler_ = chromeos::CrasAudioHandler::Get();
   }
@@ -163,7 +163,7 @@ class VolumeControllerSoundsTest : public VolumeControllerTest {
   VolumeControllerSoundsTest() : sounds_manager_(NULL) {}
   virtual ~VolumeControllerSoundsTest() {}
 
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+  virtual void SetUpInProcessBrowserTestFixture() override {
     sounds_manager_ = new SoundsManagerTestImpl();
     media::SoundsManager::InitializeForTesting(sounds_manager_);
   }
@@ -239,7 +239,7 @@ class VolumeControllerSoundsDisabledTest : public VolumeControllerSoundsTest {
   VolumeControllerSoundsDisabledTest() {}
   virtual ~VolumeControllerSoundsDisabledTest() {}
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     VolumeControllerSoundsTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(chromeos::switches::kDisableVolumeAdjustSound);
   }
diff --git a/chrome/browser/ui/ash/volume_controller_chromeos.h b/chrome/browser/ui/ash/volume_controller_chromeos.h
index f0a7b2a..6dd96bd 100644
--- a/chrome/browser/ui/ash/volume_controller_chromeos.h
+++ b/chrome/browser/ui/ash/volume_controller_chromeos.h
@@ -19,13 +19,13 @@ class VolumeController : public ash::VolumeControlDelegate,
   virtual ~VolumeController();
 
   // Overridden from ash::VolumeControlDelegate:
-  virtual bool HandleVolumeMute(const ui::Accelerator& accelerator) OVERRIDE;
-  virtual bool HandleVolumeDown(const ui::Accelerator& accelerator) OVERRIDE;
-  virtual bool HandleVolumeUp(const ui::Accelerator& accelerator) OVERRIDE;
+  virtual bool HandleVolumeMute(const ui::Accelerator& accelerator) override;
+  virtual bool HandleVolumeDown(const ui::Accelerator& accelerator) override;
+  virtual bool HandleVolumeUp(const ui::Accelerator& accelerator) override;
 
   // Overridden from chromeos::CrasAudioHandler::AudioObserver.
-  virtual void OnOutputVolumeChanged() OVERRIDE;
-  virtual void OnOutputMuteChanged() OVERRIDE;
+  virtual void OnOutputVolumeChanged() override;
+  virtual void OnOutputMuteChanged() override;
 
  private:
 
diff --git a/chrome/browser/ui/ash/window_positioner_unittest.cc b/chrome/browser/ui/ash/window_positioner_unittest.cc
index d57ebb8..2b1ce8f 100644
--- a/chrome/browser/ui/ash/window_positioner_unittest.cc
+++ b/chrome/browser/ui/ash/window_positioner_unittest.cc
@@ -33,7 +33,7 @@ class TestBrowserWindowAura : public TestBrowserWindow {
   explicit TestBrowserWindowAura(aura::Window* native_window);
   virtual ~TestBrowserWindowAura();
 
-  virtual gfx::NativeWindow GetNativeWindow() OVERRIDE {
+  virtual gfx::NativeWindow GetNativeWindow() override {
     return native_window_;
   }
 
@@ -58,8 +58,8 @@ class WindowPositionerTest : public AshTestBase {
  public:
   WindowPositionerTest();
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
  protected:
   aura::Window* window() { return window_.get(); }
diff --git a/chrome/browser/ui/aura/active_desktop_monitor.h b/chrome/browser/ui/aura/active_desktop_monitor.h
index 9a05ea3..d0718c0 100644
--- a/chrome/browser/ui/aura/active_desktop_monitor.h
+++ b/chrome/browser/ui/aura/active_desktop_monitor.h
@@ -30,8 +30,8 @@ class ActiveDesktopMonitor : public aura::EnvObserver {
   static bool IsDesktopWindow(aura::WindowTreeHost* host);
 
   // aura::EnvObserver methods.
-  virtual void OnWindowInitialized(aura::Window* window) OVERRIDE;
-  virtual void OnHostActivated(aura::WindowTreeHost* host) OVERRIDE;
+  virtual void OnWindowInitialized(aura::Window* window) override;
+  virtual void OnHostActivated(aura::WindowTreeHost* host) override;
 
   static ActiveDesktopMonitor* g_instance_;
   chrome::HostDesktopType last_activated_desktop_;
diff --git a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h
index 977bbbe..ad4957c 100644
--- a/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h
+++ b/chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h
@@ -18,11 +18,11 @@ class ChromeBrowserMainExtraPartsAura : public ChromeBrowserMainExtraParts {
   virtual ~ChromeBrowserMainExtraPartsAura();
 
   // Overridden from ChromeBrowserMainExtraParts:
-  virtual void PreEarlyInitialization() OVERRIDE;
-  virtual void ToolkitInitialized() OVERRIDE;
-  virtual void PreCreateThreads() OVERRIDE;
-  virtual void PreProfileInit() OVERRIDE;
-  virtual void PostMainMessageLoopRun() OVERRIDE;
+  virtual void PreEarlyInitialization() override;
+  virtual void ToolkitInitialized() override;
+  virtual void PreCreateThreads() override;
+  virtual void PreProfileInit() override;
+  virtual void PostMainMessageLoopRun() override;
 
  private:
 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
diff --git a/chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h b/chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h
index e5f27b0..6a153ce 100644
--- a/chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h
+++ b/chrome/browser/ui/aura/tab_contents/web_drag_bookmark_handler_aura.h
@@ -25,13 +25,13 @@ class WebDragBookmarkHandlerAura : public content::WebDragDestDelegate {
   virtual ~WebDragBookmarkHandlerAura();
 
   // Overridden from content::WebDragDestDelegate:
-  virtual void DragInitialize(content::WebContents* contents) OVERRIDE;
-  virtual void OnDragOver() OVERRIDE;
-  virtual void OnDragEnter() OVERRIDE;
-  virtual void OnDrop() OVERRIDE;
-  virtual void OnDragLeave() OVERRIDE;
+  virtual void DragInitialize(content::WebContents* contents) override;
+  virtual void OnDragOver() override;
+  virtual void OnDragEnter() override;
+  virtual void OnDrop() override;
+  virtual void OnDragLeave() override;
 
-  virtual void OnReceiveDragData(const ui::OSExchangeData& data) OVERRIDE;
+  virtual void OnReceiveDragData(const ui::OSExchangeData& data) override;
 
  private:
   // The BookmarkTabHelper.
diff --git a/chrome/browser/ui/auto_login_infobar_delegate.cc b/chrome/browser/ui/auto_login_infobar_delegate.cc
index f1db5b8..1e092f6 100644
--- a/chrome/browser/ui/auto_login_infobar_delegate.cc
+++ b/chrome/browser/ui/auto_login_infobar_delegate.cc
@@ -58,11 +58,11 @@ class AutoLoginRedirector : public UbertokenConsumer,
 
  private:
   // Overriden from UbertokenConsumer:
-  virtual void OnUbertokenSuccess(const std::string& token) OVERRIDE;
-  virtual void OnUbertokenFailure(const GoogleServiceAuthError& error) OVERRIDE;
+  virtual void OnUbertokenSuccess(const std::string& token) override;
+  virtual void OnUbertokenFailure(const GoogleServiceAuthError& error) override;
 
   // Implementation of content::WebContentsObserver
-  virtual void WebContentsDestroyed() OVERRIDE;
+  virtual void WebContentsDestroyed() override;
 
   // Redirect tab to MergeSession URL, logging the user in and navigating
   // to the desired page.
diff --git a/chrome/browser/ui/auto_login_infobar_delegate.h b/chrome/browser/ui/auto_login_infobar_delegate.h
index d5f5b30..7877240 100644
--- a/chrome/browser/ui/auto_login_infobar_delegate.h
+++ b/chrome/browser/ui/auto_login_infobar_delegate.h
@@ -56,18 +56,18 @@ class AutoLoginInfoBarDelegate : public ConfirmInfoBarDelegate,
 
  private:
   // ConfirmInfoBarDelegate:
-  virtual void InfoBarDismissed() OVERRIDE;
-  virtual int GetIconID() const OVERRIDE;
-  virtual Type GetInfoBarType() const OVERRIDE;
-  virtual AutoLoginInfoBarDelegate* AsAutoLoginInfoBarDelegate() OVERRIDE;
-  virtual base::string16 GetMessageText() const OVERRIDE;
-  virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
-  virtual bool Accept() OVERRIDE;
-  virtual bool Cancel() OVERRIDE;
+  virtual void InfoBarDismissed() override;
+  virtual int GetIconID() const override;
+  virtual Type GetInfoBarType() const override;
+  virtual AutoLoginInfoBarDelegate* AsAutoLoginInfoBarDelegate() override;
+  virtual base::string16 GetMessageText() const override;
+  virtual base::string16 GetButtonLabel(InfoBarButton button) const override;
+  virtual bool Accept() override;
+  virtual bool Cancel() override;
 
   // SigninManagerBase::Observer:
   virtual void GoogleSignedOut(const std::string& account_id,
-                               const std::string& username) OVERRIDE;
+                               const std::string& username) override;
 
   const Params params_;
 
diff --git a/chrome/browser/ui/autofill/account_chooser_model.h b/chrome/browser/ui/autofill/account_chooser_model.h
index 8765b33..b406660 100644
--- a/chrome/browser/ui/autofill/account_chooser_model.h
+++ b/chrome/browser/ui/autofill/account_chooser_model.h
@@ -55,12 +55,12 @@ class AccountChooserModel : public ui::SimpleMenuModel,
   virtual ~AccountChooserModel();
 
   // ui::SimpleMenuModel::Delegate implementation.
-  virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
-  virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
+  virtual bool IsCommandIdChecked(int command_id) const override;
+  virtual bool IsCommandIdEnabled(int command_id) const override;
   virtual bool GetAcceleratorForCommandId(
       int command_id,
-      ui::Accelerator* accelerator) OVERRIDE;
-  virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE;
+      ui::Accelerator* accelerator) override;
+  virtual void ExecuteCommand(int command_id, int event_flags) override;
 
   // Sets the selection to the given wallet account.
   void SelectWalletAccount(size_t user_index);
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
index f4b074f..f2c90cf 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_browsertest.cc
@@ -95,7 +95,7 @@ class MockAutofillMetrics : public AutofillMetrics {
 
   virtual void LogDialogUiDuration(
       const base::TimeDelta& duration,
-      DialogDismissalAction dismissal_action) const OVERRIDE {
+      DialogDismissalAction dismissal_action) const override {
     // Ignore constness for testing.
     MockAutofillMetrics* mutable_this = const_cast<MockAutofillMetrics*>(this);
     mutable_this->dialog_dismissal_action_ = dismissal_action;
@@ -141,11 +141,11 @@ class TestAutofillDialogController : public AutofillDialogControllerImpl {
 
   virtual ~TestAutofillDialogController() {}
 
-  virtual GURL SignInUrl() const OVERRIDE {
+  virtual GURL SignInUrl() const override {
     return GURL(chrome::kChromeUIVersionURL);
   }
 
-  virtual void ViewClosed() OVERRIDE {
+  virtual void ViewClosed() override {
     message_loop_runner_->Quit();
     AutofillDialogControllerImpl::ViewClosed();
   }
@@ -153,7 +153,7 @@ class TestAutofillDialogController : public AutofillDialogControllerImpl {
   virtual base::string16 InputValidityMessage(
       DialogSection section,
       ServerFieldType type,
-      const base::string16& value) OVERRIDE {
+      const base::string16& value) override {
     if (!use_validation_)
       return base::string16();
     return AutofillDialogControllerImpl::InputValidityMessage(
@@ -162,7 +162,7 @@ class TestAutofillDialogController : public AutofillDialogControllerImpl {
 
   virtual ValidityMessages InputsAreValid(
       DialogSection section,
-      const FieldValueMap& inputs) OVERRIDE {
+      const FieldValueMap& inputs) override {
     if (!use_validation_)
       return ValidityMessages();
     return AutofillDialogControllerImpl::InputsAreValid(section, inputs);
@@ -170,7 +170,7 @@ class TestAutofillDialogController : public AutofillDialogControllerImpl {
 
   // Saving to Chrome is tested in AutofillDialogControllerImpl unit tests.
   // TODO(estade): test that the view defaults to saving to Chrome.
-  virtual bool ShouldOfferToSaveInChrome() const OVERRIDE {
+  virtual bool ShouldOfferToSaveInChrome() const override {
     return true;
   }
 
@@ -184,7 +184,7 @@ class TestAutofillDialogController : public AutofillDialogControllerImpl {
 
   MOCK_METHOD0(LoadRiskFingerprintData, void());
 
-  virtual std::vector<DialogNotification> CurrentNotifications() OVERRIDE {
+  virtual std::vector<DialogNotification> CurrentNotifications() override {
     return notifications_;
   }
 
@@ -226,27 +226,27 @@ class TestAutofillDialogController : public AutofillDialogControllerImpl {
   }
 
  protected:
-  virtual PersonalDataManager* GetManager() const OVERRIDE {
+  virtual PersonalDataManager* GetManager() const override {
     return &const_cast<TestAutofillDialogController*>(this)->test_manager_;
   }
 
-  virtual AddressValidator* GetValidator() OVERRIDE {
+  virtual AddressValidator* GetValidator() override {
     return &mock_validator_;
   }
 
-  virtual wallet::WalletClient* GetWalletClient() OVERRIDE {
+  virtual wallet::WalletClient* GetWalletClient() override {
     return &mock_wallet_client_;
   }
 
   virtual bool IsSignInContinueUrl(const GURL& url, size_t* user_index) const
-      OVERRIDE {
+      override {
     *user_index = sign_in_user_index_;
     return url == wallet::GetSignInContinueUrl();
   }
 
  private:
   // To specify our own metric logger.
-  virtual const AutofillMetrics& GetMetricLogger() const OVERRIDE {
+  virtual const AutofillMetrics& GetMetricLogger() const override {
     return metric_logger_;
   }
 
@@ -289,7 +289,7 @@ class NavEntryCommittedObserver : public content::WindowedNotificationObserver {
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE {
+                       const content::NotificationDetails& details) override {
     content::LoadCommittedDetails* load_details =
         content::Details<content::LoadCommittedDetails>(details).ptr();
     if (load_details->entry->GetVirtualURL() != url_)
@@ -311,11 +311,11 @@ class AutofillDialogControllerTest : public InProcessBrowserTest {
   AutofillDialogControllerTest() : controller_(NULL) {}
   virtual ~AutofillDialogControllerTest() {}
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     command_line->AppendSwitch(::switches::kReduceSecurityForTesting);
   }
 
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     autofill::test::DisableSystemServices(browser()->profile()->GetPrefs());
     InitializeController();
   }
@@ -1501,7 +1501,7 @@ class AutofillDialogControllerSecurityTest :
   AutofillDialogControllerSecurityTest() {}
   virtual ~AutofillDialogControllerSecurityTest() {}
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     CHECK(!command_line->HasSwitch(::switches::kReduceSecurityForTesting));
   }
 
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
index 561fb6b..2e3ddd0 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_impl.h
@@ -95,137 +95,137 @@ class AutofillDialogControllerImpl
       const AutofillClient::ResultCallback& callback);
 
   // AutofillDialogController implementation.
-  virtual void Show() OVERRIDE;
-  virtual void Hide() OVERRIDE;
-  virtual void TabActivated() OVERRIDE;
+  virtual void Show() override;
+  virtual void Hide() override;
+  virtual void TabActivated() override;
 
   // AutofillDialogViewDelegate implementation.
-  virtual base::string16 DialogTitle() const OVERRIDE;
-  virtual base::string16 AccountChooserText() const OVERRIDE;
-  virtual base::string16 SignInLinkText() const OVERRIDE;
-  virtual base::string16 SpinnerText() const OVERRIDE;
-  virtual base::string16 EditSuggestionText() const OVERRIDE;
-  virtual base::string16 CancelButtonText() const OVERRIDE;
-  virtual base::string16 ConfirmButtonText() const OVERRIDE;
-  virtual base::string16 SaveLocallyText() const OVERRIDE;
-  virtual base::string16 SaveLocallyTooltip() const OVERRIDE;
-  virtual base::string16 LegalDocumentsText() OVERRIDE;
-  virtual bool ShouldShowSpinner() const OVERRIDE;
-  virtual bool ShouldShowAccountChooser() const OVERRIDE;
-  virtual bool ShouldShowSignInWebView() const OVERRIDE;
-  virtual GURL SignInUrl() const OVERRIDE;
-  virtual bool ShouldOfferToSaveInChrome() const OVERRIDE;
-  virtual bool ShouldSaveInChrome() const OVERRIDE;
-  virtual ui::MenuModel* MenuModelForAccountChooser() OVERRIDE;
-  virtual gfx::Image AccountChooserImage() OVERRIDE;
-  virtual gfx::Image ButtonStripImage() const OVERRIDE;
-  virtual int GetDialogButtons() const OVERRIDE;
-  virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE;
-  virtual DialogOverlayState GetDialogOverlay() OVERRIDE;
-  virtual const std::vector<gfx::Range>& LegalDocumentLinks() OVERRIDE;
-  virtual bool SectionIsActive(DialogSection section) const OVERRIDE;
+  virtual base::string16 DialogTitle() const override;
+  virtual base::string16 AccountChooserText() const override;
+  virtual base::string16 SignInLinkText() const override;
+  virtual base::string16 SpinnerText() const override;
+  virtual base::string16 EditSuggestionText() const override;
+  virtual base::string16 CancelButtonText() const override;
+  virtual base::string16 ConfirmButtonText() const override;
+  virtual base::string16 SaveLocallyText() const override;
+  virtual base::string16 SaveLocallyTooltip() const override;
+  virtual base::string16 LegalDocumentsText() override;
+  virtual bool ShouldShowSpinner() const override;
+  virtual bool ShouldShowAccountChooser() const override;
+  virtual bool ShouldShowSignInWebView() const override;
+  virtual GURL SignInUrl() const override;
+  virtual bool ShouldOfferToSaveInChrome() const override;
+  virtual bool ShouldSaveInChrome() const override;
+  virtual ui::MenuModel* MenuModelForAccountChooser() override;
+  virtual gfx::Image AccountChooserImage() override;
+  virtual gfx::Image ButtonStripImage() const override;
+  virtual int GetDialogButtons() const override;
+  virtual bool IsDialogButtonEnabled(ui::DialogButton button) const override;
+  virtual DialogOverlayState GetDialogOverlay() override;
+  virtual const std::vector<gfx::Range>& LegalDocumentLinks() override;
+  virtual bool SectionIsActive(DialogSection section) const override;
   virtual const DetailInputs& RequestedFieldsForSection(DialogSection section)
-      const OVERRIDE;
+      const override;
   virtual ui::ComboboxModel* ComboboxModelForAutofillType(
-      ServerFieldType type) OVERRIDE;
-  virtual ui::MenuModel* MenuModelForSection(DialogSection section) OVERRIDE;
-  virtual base::string16 LabelForSection(DialogSection section) const OVERRIDE;
+      ServerFieldType type) override;
+  virtual ui::MenuModel* MenuModelForSection(DialogSection section) override;
+  virtual base::string16 LabelForSection(DialogSection section) const override;
   virtual SuggestionState SuggestionStateForSection(
-      DialogSection section) OVERRIDE;
+      DialogSection section) override;
   virtual FieldIconMap IconsForFields(const FieldValueMap& user_inputs)
-      const OVERRIDE;
-  virtual bool FieldControlsIcons(ServerFieldType type) const OVERRIDE;
-  virtual base::string16 TooltipForField(ServerFieldType type) const OVERRIDE;
+      const override;
+  virtual bool FieldControlsIcons(ServerFieldType type) const override;
+  virtual base::string16 TooltipForField(ServerFieldType type) const override;
   virtual bool InputIsEditable(const DetailInput& input, DialogSection section)
-      OVERRIDE;
+      override;
   virtual base::string16 InputValidityMessage(DialogSection section,
                                         ServerFieldType type,
-                                        const base::string16& value) OVERRIDE;
+                                        const base::string16& value) override;
   virtual ValidityMessages InputsAreValid(
-      DialogSection section, const FieldValueMap& inputs) OVERRIDE;
+      DialogSection section, const FieldValueMap& inputs) override;
   virtual void UserEditedOrActivatedInput(DialogSection section,
                                           ServerFieldType type,
                                           gfx::NativeView parent_view,
                                           const gfx::Rect& content_bounds,
                                           const base::string16& field_contents,
-                                          bool was_edit) OVERRIDE;
+                                          bool was_edit) override;
   virtual bool HandleKeyPressEventInInput(
-      const content::NativeWebKeyboardEvent& event) OVERRIDE;
-  virtual void FocusMoved() OVERRIDE;
-  virtual bool ShouldShowErrorBubble() const OVERRIDE;
-  virtual void ViewClosed() OVERRIDE;
-  virtual std::vector<DialogNotification> CurrentNotifications() OVERRIDE;
-  virtual void LinkClicked(const GURL& url) OVERRIDE;
-  virtual void SignInLinkClicked() OVERRIDE;
+      const content::NativeWebKeyboardEvent& event) override;
+  virtual void FocusMoved() override;
+  virtual bool ShouldShowErrorBubble() const override;
+  virtual void ViewClosed() override;
+  virtual std::vector<DialogNotification> CurrentNotifications() override;
+  virtual void LinkClicked(const GURL& url) override;
+  virtual void SignInLinkClicked() override;
   virtual void NotificationCheckboxStateChanged(DialogNotification::Type type,
-                                                bool checked) OVERRIDE;
-  virtual void LegalDocumentLinkClicked(const gfx::Range& range) OVERRIDE;
-  virtual bool OnCancel() OVERRIDE;
-  virtual bool OnAccept() OVERRIDE;
-  virtual Profile* profile() OVERRIDE;
-  virtual content::WebContents* GetWebContents() OVERRIDE;
+                                                bool checked) override;
+  virtual void LegalDocumentLinkClicked(const gfx::Range& range) override;
+  virtual bool OnCancel() override;
+  virtual bool OnAccept() override;
+  virtual Profile* profile() override;
+  virtual content::WebContents* GetWebContents() override;
 
   // AutofillPopupDelegate implementation.
-  virtual void OnPopupShown() OVERRIDE;
-  virtual void OnPopupHidden() OVERRIDE;
+  virtual void OnPopupShown() override;
+  virtual void OnPopupHidden() override;
   virtual void DidSelectSuggestion(const base::string16& value,
-                                   int identifier) OVERRIDE;
+                                   int identifier) override;
   virtual void DidAcceptSuggestion(const base::string16& value,
-                                   int identifier) OVERRIDE;
+                                   int identifier) override;
   virtual void RemoveSuggestion(const base::string16& value,
-                                int identifier) OVERRIDE;
-  virtual void ClearPreviewedForm() OVERRIDE;
+                                int identifier) override;
+  virtual void ClearPreviewedForm() override;
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // SuggestionsMenuModelDelegate implementation.
   virtual void SuggestionItemSelected(SuggestionsMenuModel* model,
-                                      size_t index) OVERRIDE;
+                                      size_t index) override;
 
   // wallet::WalletClientDelegate implementation.
-  virtual const AutofillMetrics& GetMetricLogger() const OVERRIDE;
-  virtual std::string GetRiskData() const OVERRIDE;
-  virtual std::string GetWalletCookieValue() const OVERRIDE;
-  virtual bool IsShippingAddressRequired() const OVERRIDE;
-  virtual void OnDidAcceptLegalDocuments() OVERRIDE;
-  virtual void OnDidAuthenticateInstrument(bool success) OVERRIDE;
+  virtual const AutofillMetrics& GetMetricLogger() const override;
+  virtual std::string GetRiskData() const override;
+  virtual std::string GetWalletCookieValue() const override;
+  virtual bool IsShippingAddressRequired() const override;
+  virtual void OnDidAcceptLegalDocuments() override;
+  virtual void OnDidAuthenticateInstrument(bool success) override;
   virtual void OnDidGetFullWallet(
-      scoped_ptr<wallet::FullWallet> full_wallet) OVERRIDE;
+      scoped_ptr<wallet::FullWallet> full_wallet) override;
   virtual void OnDidGetWalletItems(
-      scoped_ptr<wallet::WalletItems> wallet_items) OVERRIDE;
+      scoped_ptr<wallet::WalletItems> wallet_items) override;
   virtual void OnDidSaveToWallet(
       const std::string& instrument_id,
       const std::string& address_id,
       const std::vector<wallet::RequiredAction>& required_actions,
-      const std::vector<wallet::FormFieldError>& form_field_errors) OVERRIDE;
+      const std::vector<wallet::FormFieldError>& form_field_errors) override;
   virtual void OnWalletError(
-      wallet::WalletClient::ErrorType error_type) OVERRIDE;
+      wallet::WalletClient::ErrorType error_type) override;
 
   // PersonalDataManagerObserver implementation.
-  virtual void OnPersonalDataChanged() OVERRIDE;
+  virtual void OnPersonalDataChanged() override;
 
   // AccountChooserModelDelegate implementation.
-  virtual void AccountChoiceChanged() OVERRIDE;
-  virtual void AddAccount() OVERRIDE;
-  virtual void UpdateAccountChooserView() OVERRIDE;
+  virtual void AccountChoiceChanged() override;
+  virtual void AddAccount() override;
+  virtual void UpdateAccountChooserView() override;
 
   // wallet::WalletSigninHelperDelegate implementation.
-  virtual void OnPassiveSigninSuccess() OVERRIDE;
+  virtual void OnPassiveSigninSuccess() override;
   virtual void OnPassiveSigninFailure(
-      const GoogleServiceAuthError& error) OVERRIDE;
+      const GoogleServiceAuthError& error) override;
   virtual void OnDidFetchWalletCookieValue(
-      const std::string& cookie_value) OVERRIDE;
+      const std::string& cookie_value) override;
 
   // gfx::AnimationDelegate implementation.
-  virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE;
-  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
+  virtual void AnimationEnded(const gfx::Animation* animation) override;
+  virtual void AnimationProgressed(const gfx::Animation* animation) override;
 
   // LoadRulesListener implementation.
   virtual void OnAddressValidationRulesLoaded(const std::string& country_code,
-                                              bool success) OVERRIDE;
+                                              bool success) override;
 
  protected:
   enum DialogSignedInState {
diff --git a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
index a190d26..3c11a9c 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
+++ b/chrome/browser/ui/autofill/autofill_dialog_controller_unittest.cc
@@ -156,70 +156,70 @@ class TestAutofillDialogView : public AutofillDialogView {
       : updates_started_(0), save_details_locally_checked_(true) {}
   virtual ~TestAutofillDialogView() {}
 
-  virtual void Show() OVERRIDE {}
-  virtual void Hide() OVERRIDE {}
+  virtual void Show() override {}
+  virtual void Hide() override {}
 
-  virtual void UpdatesStarted() OVERRIDE {
+  virtual void UpdatesStarted() override {
     updates_started_++;
   }
 
-  virtual void UpdatesFinished() OVERRIDE {
+  virtual void UpdatesFinished() override {
     updates_started_--;
     EXPECT_GE(updates_started_, 0);
   }
 
-  virtual void UpdateNotificationArea() OVERRIDE {
+  virtual void UpdateNotificationArea() override {
     EXPECT_GE(updates_started_, 1);
   }
 
-  virtual void UpdateAccountChooser() OVERRIDE {
+  virtual void UpdateAccountChooser() override {
     EXPECT_GE(updates_started_, 1);
   }
 
-  virtual void UpdateButtonStrip() OVERRIDE {
+  virtual void UpdateButtonStrip() override {
     EXPECT_GE(updates_started_, 1);
   }
 
-  virtual void UpdateOverlay() OVERRIDE {
+  virtual void UpdateOverlay() override {
     EXPECT_GE(updates_started_, 1);
   }
 
-  virtual void UpdateDetailArea() OVERRIDE {
+  virtual void UpdateDetailArea() override {
     EXPECT_GE(updates_started_, 1);
   }
 
-  virtual void UpdateSection(DialogSection section) OVERRIDE {
+  virtual void UpdateSection(DialogSection section) override {
     section_updates_[section]++;
     EXPECT_GE(updates_started_, 1);
   }
 
-  virtual void UpdateErrorBubble() OVERRIDE {
+  virtual void UpdateErrorBubble() override {
     EXPECT_GE(updates_started_, 1);
   }
 
   virtual void FillSection(DialogSection section,
-                           ServerFieldType originating_type) OVERRIDE {}
+                           ServerFieldType originating_type) override {}
   virtual void GetUserInput(DialogSection section, FieldValueMap* output)
-      OVERRIDE {
+      override {
     *output = outputs_[section];
   }
 
-  virtual base::string16 GetCvc() OVERRIDE { return base::string16(); }
+  virtual base::string16 GetCvc() override { return base::string16(); }
 
-  virtual bool SaveDetailsLocally() OVERRIDE {
+  virtual bool SaveDetailsLocally() override {
     return save_details_locally_checked_;
   }
 
-  virtual const content::NavigationController* ShowSignIn() OVERRIDE {
+  virtual const content::NavigationController* ShowSignIn() override {
     return NULL;
   }
-  virtual void HideSignIn() OVERRIDE {}
+  virtual void HideSignIn() override {}
 
   MOCK_METHOD0(ModelChanged, void());
   MOCK_METHOD0(UpdateForErrors, void());
 
-  virtual void OnSignInResize(const gfx::Size& pref_size) OVERRIDE {}
-  virtual void ValidateSection(DialogSection) OVERRIDE {}
+  virtual void OnSignInResize(const gfx::Size& pref_size) override {}
+  virtual void ValidateSection(DialogSection) override {}
 
   void SetUserInput(DialogSection section, const FieldValueMap& map) {
     outputs_[section] = map;
@@ -273,7 +273,7 @@ class TestAutofillDialogController
 
   virtual ~TestAutofillDialogController() {}
 
-  virtual AutofillDialogView* CreateView() OVERRIDE {
+  virtual AutofillDialogView* CreateView() override {
     return new testing::NiceMock<TestAutofillDialogView>();
   }
 
@@ -341,40 +341,40 @@ class TestAutofillDialogController
   using AutofillDialogControllerImpl::SignedInState;
 
  protected:
-  virtual PersonalDataManager* GetManager() const OVERRIDE {
+  virtual PersonalDataManager* GetManager() const override {
     return const_cast<TestAutofillDialogController*>(this)->
         GetTestingManager();
   }
 
-  virtual AddressValidator* GetValidator() OVERRIDE {
+  virtual AddressValidator* GetValidator() override {
     return &mock_validator_;
   }
 
-  virtual wallet::WalletClient* GetWalletClient() OVERRIDE {
+  virtual wallet::WalletClient* GetWalletClient() override {
     return &mock_wallet_client_;
   }
 
-  virtual void OpenTabWithUrl(const GURL& url) OVERRIDE {
+  virtual void OpenTabWithUrl(const GURL& url) override {
     open_tab_url_ = url;
   }
 
   virtual void ShowNewCreditCardBubble(
       scoped_ptr<CreditCard> new_card,
-      scoped_ptr<AutofillProfile> billing_profile) OVERRIDE {
+      scoped_ptr<AutofillProfile> billing_profile) override {
     mock_new_card_bubble_controller_->Show(new_card.Pass(),
                                            billing_profile.Pass());
   }
 
   // AutofillDialogControllerImpl calls this method before showing the dialog
   // window.
-  virtual void SubmitButtonDelayBegin() OVERRIDE {
+  virtual void SubmitButtonDelayBegin() override {
     // Do not delay enabling the submit button in testing.
     submit_button_delay_count_++;
   }
 
  private:
   // To specify our own metric logger.
-  virtual const AutofillMetrics& GetMetricLogger() const OVERRIDE {
+  virtual const AutofillMetrics& GetMetricLogger() const override {
     return metric_logger_;
   }
 
@@ -400,12 +400,12 @@ class AutofillDialogControllerTest : public ChromeRenderViewHostTestHarness {
   AutofillDialogControllerTest(): form_structure_(NULL) {}
 
   // testing::Test implementation:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
     Reset();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     if (controller_)
       controller_->ViewClosed();
     ChromeRenderViewHostTestHarness::TearDown();
diff --git a/chrome/browser/ui/autofill/autofill_dialog_models.h b/chrome/browser/ui/autofill/autofill_dialog_models.h
index 15b005e..c797d63 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_models.h
+++ b/chrome/browser/ui/autofill/autofill_dialog_models.h
@@ -80,12 +80,12 @@ class SuggestionsMenuModel : public ui::SimpleMenuModel,
   void SetEnabled(const std::string& item_key, bool enabled);
 
   // ui::SimpleMenuModel::Delegate implementation.
-  virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
-  virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
+  virtual bool IsCommandIdChecked(int command_id) const override;
+  virtual bool IsCommandIdEnabled(int command_id) const override;
   virtual bool GetAcceleratorForCommandId(
       int command_id,
-      ui::Accelerator* accelerator) OVERRIDE;
-  virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE;
+      ui::Accelerator* accelerator) override;
+  virtual void ExecuteCommand(int command_id, int event_flags) override;
 
  private:
   // Represents an item in this model.
@@ -118,8 +118,8 @@ class MonthComboboxModel : public ui::ComboboxModel {
   static base::string16 FormatMonth(int index);
 
   // ui::Combobox implementation:
-  virtual int GetItemCount() const OVERRIDE;
-  virtual base::string16 GetItemAt(int index) OVERRIDE;
+  virtual int GetItemCount() const override;
+  virtual base::string16 GetItemAt(int index) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(MonthComboboxModel);
@@ -132,8 +132,8 @@ class YearComboboxModel : public ui::ComboboxModel {
   virtual ~YearComboboxModel();
 
   // ui::Combobox implementation:
-  virtual int GetItemCount() const OVERRIDE;
-  virtual base::string16 GetItemAt(int index) OVERRIDE;
+  virtual int GetItemCount() const override;
+  virtual base::string16 GetItemAt(int index) override;
 
  private:
   // The current year (e.g., 2012).
diff --git a/chrome/browser/ui/autofill/autofill_dialog_sign_in_delegate.h b/chrome/browser/ui/autofill/autofill_dialog_sign_in_delegate.h
index 5a748cf..fbd94a1 100644
--- a/chrome/browser/ui/autofill/autofill_dialog_sign_in_delegate.h
+++ b/chrome/browser/ui/autofill/autofill_dialog_sign_in_delegate.h
@@ -31,23 +31,23 @@ class AutofillDialogSignInDelegate: public content::WebContentsDelegate,
 
   // WebContentsDelegate implementation.
   virtual void ResizeDueToAutoResize(content::WebContents* source,
-                                     const gfx::Size& preferred_size) OVERRIDE;
+                                     const gfx::Size& preferred_size) override;
   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 PreHandleGestureEvent(
       content::WebContents* source,
-      const blink::WebGestureEvent& event) OVERRIDE;
+      const blink::WebGestureEvent& event) override;
 
   // WebContentsObserver implementation.
   virtual void RenderViewCreated(
-      content::RenderViewHost* render_view_host) OVERRIDE;
+      content::RenderViewHost* render_view_host) override;
 
   // Updates the size limits and enables auto-resize for this view.
   void UpdateLimitsAndEnableAutoResize(const gfx::Size& minimum_size,
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_impl.h b/chrome/browser/ui/autofill/autofill_popup_controller_impl.h
index cf02b74..e167736 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_impl.h
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_impl.h
@@ -49,10 +49,10 @@ class AutofillPopupControllerImpl : public AutofillPopupController {
 
   // Hides the popup and destroys the controller. This also invalidates
   // |delegate_|.
-  virtual void Hide() OVERRIDE;
+  virtual void Hide() override;
 
   // Invoked when the view was destroyed by by someone other than this class.
-  virtual void ViewDestroyed() OVERRIDE;
+  virtual void ViewDestroyed() override;
 
   bool HandleKeyPressEvent(const content::NativeWebKeyboardEvent& event);
 
@@ -73,32 +73,32 @@ class AutofillPopupControllerImpl : public AutofillPopupController {
   virtual ~AutofillPopupControllerImpl();
 
   // AutofillPopupController implementation.
-  virtual void UpdateBoundsAndRedrawPopup() OVERRIDE;
-  virtual void SetSelectionAtPoint(const gfx::Point& point) OVERRIDE;
-  virtual bool AcceptSelectedLine() OVERRIDE;
-  virtual void SelectionCleared() OVERRIDE;
-  virtual void AcceptSuggestion(size_t index) OVERRIDE;
+  virtual void UpdateBoundsAndRedrawPopup() override;
+  virtual void SetSelectionAtPoint(const gfx::Point& point) override;
+  virtual bool AcceptSelectedLine() override;
+  virtual void SelectionCleared() override;
+  virtual void AcceptSuggestion(size_t index) override;
   virtual int GetIconResourceID(
-      const base::string16& resource_name) const OVERRIDE;
-  virtual bool CanDelete(size_t index) const OVERRIDE;
-  virtual bool IsWarning(size_t index) const OVERRIDE;
-  virtual gfx::Rect GetRowBounds(size_t index) OVERRIDE;
-  virtual void SetPopupBounds(const gfx::Rect& bounds) OVERRIDE;
-  virtual const gfx::Rect& popup_bounds() const OVERRIDE;
-  virtual gfx::NativeView container_view() OVERRIDE;
-  virtual const gfx::RectF& element_bounds() const OVERRIDE;
-  virtual bool IsRTL() const OVERRIDE;
-
-  virtual const std::vector<base::string16>& names() const OVERRIDE;
-  virtual const std::vector<base::string16>& subtexts() const OVERRIDE;
-  virtual const std::vector<base::string16>& icons() const OVERRIDE;
-  virtual const std::vector<int>& identifiers() const OVERRIDE;
+      const base::string16& resource_name) const override;
+  virtual bool CanDelete(size_t index) const override;
+  virtual bool IsWarning(size_t index) const override;
+  virtual gfx::Rect GetRowBounds(size_t index) override;
+  virtual void SetPopupBounds(const gfx::Rect& bounds) override;
+  virtual const gfx::Rect& popup_bounds() const override;
+  virtual gfx::NativeView container_view() override;
+  virtual const gfx::RectF& element_bounds() const override;
+  virtual bool IsRTL() const override;
+
+  virtual const std::vector<base::string16>& names() const override;
+  virtual const std::vector<base::string16>& subtexts() const override;
+  virtual const std::vector<base::string16>& icons() const override;
+  virtual const std::vector<int>& identifiers() const override;
 #if !defined(OS_ANDROID)
   virtual const gfx::FontList& GetNameFontListForRow(
-      size_t index) const OVERRIDE;
-  virtual const gfx::FontList& subtext_font_list() const OVERRIDE;
+      size_t index) const override;
+  virtual const gfx::FontList& subtext_font_list() const override;
 #endif
-  virtual int selected_line() const OVERRIDE;
+  virtual int selected_line() const override;
 
   content::WebContents* web_contents();
 
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc b/chrome/browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc
index 9b8f81b..d289304 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc
@@ -30,13 +30,13 @@ class TestAutofillExternalDelegate : public AutofillExternalDelegate {
         popup_hidden_(true) {}
   virtual ~TestAutofillExternalDelegate() {}
 
-  virtual void OnPopupShown() OVERRIDE {
+  virtual void OnPopupShown() override {
     popup_hidden_ = false;
 
     AutofillExternalDelegate::OnPopupShown();
   }
 
-  virtual void OnPopupHidden() OVERRIDE {
+  virtual void OnPopupHidden() override {
     popup_hidden_ = true;
 
     if (message_loop_runner_.get())
@@ -71,7 +71,7 @@ class AutofillPopupControllerBrowserTest
   AutofillPopupControllerBrowserTest() {}
   virtual ~AutofillPopupControllerBrowserTest() {}
 
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     content::WebContents* web_contents =
         browser()->tab_strip_model()->GetActiveWebContents();
     ASSERT_TRUE(web_contents != NULL);
@@ -88,7 +88,7 @@ class AutofillPopupControllerBrowserTest
 
   // Normally the WebContents will automatically delete the delegate, but here
   // the delegate is owned by this test, so we have to manually destroy.
-  virtual void WebContentsDestroyed() OVERRIDE {
+  virtual void WebContentsDestroyed() override {
     autofill_external_delegate_.reset();
   }
 
diff --git a/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc b/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc
index 4755ad4..4e7b48a 100644
--- a/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc
+++ b/chrome/browser/ui/autofill/autofill_popup_controller_unittest.cc
@@ -44,10 +44,10 @@ class MockAutofillExternalDelegate : public AutofillExternalDelegate {
   virtual ~MockAutofillExternalDelegate() {}
 
   virtual void DidSelectSuggestion(const base::string16& value,
-                                   int identifier) OVERRIDE {}
+                                   int identifier) override {}
   virtual void RemoveSuggestion(const base::string16& value,
-                                int identifier) OVERRIDE {}
-  virtual void ClearPreviewedForm() OVERRIDE {}
+                                int identifier) override {}
+  virtual void ClearPreviewedForm() override {}
   base::WeakPtr<AutofillExternalDelegate> GetWeakPtr() {
     return AutofillExternalDelegate::GetWeakPtr();
   }
@@ -58,7 +58,7 @@ class MockAutofillClient : public autofill::TestAutofillClient {
   MockAutofillClient() : prefs_(autofill::test::PrefServiceForTesting()) {}
   virtual ~MockAutofillClient() {}
 
-  virtual PrefService* GetPrefs() OVERRIDE { return prefs_.get(); }
+  virtual PrefService* GetPrefs() override { return prefs_.get(); }
 
  private:
   scoped_ptr<PrefService> prefs_;
@@ -113,7 +113,7 @@ class TestAutofillPopupController : public AutofillPopupControllerImpl {
   }
 
  private:
-  virtual void ShowView() OVERRIDE {}
+  virtual void ShowView() override {}
 
   TestPopupControllerCommon* test_controller_common_;
 };
@@ -127,7 +127,7 @@ class AutofillPopupControllerUnitTest : public ChromeRenderViewHostTestHarness {
         autofill_popup_controller_(NULL) {}
   virtual ~AutofillPopupControllerUnitTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
 
     ContentAutofillDriver::CreateForWebContentsAndDelegate(
@@ -147,7 +147,7 @@ class AutofillPopupControllerUnitTest : public ChromeRenderViewHostTestHarness {
             external_delegate_->GetWeakPtr(),gfx::Rect());
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // This will make sure the controller and the view (if any) are both
     // cleaned up.
     if (autofill_popup_controller_)
diff --git a/chrome/browser/ui/autofill/chrome_autofill_client.h b/chrome/browser/ui/autofill/chrome_autofill_client.h
index ac5fa76..a337dc5 100644
--- a/chrome/browser/ui/autofill/chrome_autofill_client.h
+++ b/chrome/browser/ui/autofill/chrome_autofill_client.h
@@ -40,18 +40,18 @@ class ChromeAutofillClient
   void TabActivated();
 
   // AutofillClient:
-  virtual PersonalDataManager* GetPersonalDataManager() OVERRIDE;
-  virtual scoped_refptr<AutofillWebDataService> GetDatabase() OVERRIDE;
-  virtual PrefService* GetPrefs() OVERRIDE;
-  virtual void HideRequestAutocompleteDialog() OVERRIDE;
-  virtual void ShowAutofillSettings() OVERRIDE;
+  virtual PersonalDataManager* GetPersonalDataManager() override;
+  virtual scoped_refptr<AutofillWebDataService> GetDatabase() override;
+  virtual PrefService* GetPrefs() override;
+  virtual void HideRequestAutocompleteDialog() override;
+  virtual void ShowAutofillSettings() override;
   virtual void ConfirmSaveCreditCard(
       const AutofillMetrics& metric_logger,
-      const base::Closure& save_card_callback) OVERRIDE;
+      const base::Closure& save_card_callback) override;
   virtual void ShowRequestAutocompleteDialog(
       const FormData& form,
       const GURL& source_url,
-      const ResultCallback& callback) OVERRIDE;
+      const ResultCallback& callback) override;
   virtual void ShowAutofillPopup(
       const gfx::RectF& element_bounds,
       base::i18n::TextDirection text_direction,
@@ -59,24 +59,24 @@ class ChromeAutofillClient
       const std::vector<base::string16>& labels,
       const std::vector<base::string16>& icons,
       const std::vector<int>& identifiers,
-      base::WeakPtr<AutofillPopupDelegate> delegate) OVERRIDE;
+      base::WeakPtr<AutofillPopupDelegate> delegate) override;
   virtual void UpdateAutofillPopupDataListValues(
       const std::vector<base::string16>& values,
-      const std::vector<base::string16>& labels) OVERRIDE;
-  virtual void HideAutofillPopup() OVERRIDE;
-  virtual bool IsAutocompleteEnabled() OVERRIDE;
+      const std::vector<base::string16>& labels) override;
+  virtual void HideAutofillPopup() override;
+  virtual bool IsAutocompleteEnabled() override;
   virtual void DetectAccountCreationForms(
-      const std::vector<autofill::FormStructure*>& forms) OVERRIDE;
+      const std::vector<autofill::FormStructure*>& forms) override;
   virtual void DidFillOrPreviewField(
       const base::string16& autofilled_value,
-      const base::string16& profile_full_name) OVERRIDE;
+      const base::string16& profile_full_name) override;
 
   // content::WebContentsObserver implementation.
-  virtual void WebContentsDestroyed() OVERRIDE;
+  virtual void WebContentsDestroyed() override;
 
   // ZoomObserver implementation.
   virtual void OnZoomChanged(
-      const ZoomController::ZoomChangedEventData& data) OVERRIDE;
+      const ZoomController::ZoomChangedEventData& data) override;
 
   // Exposed for testing.
   AutofillDialogController* GetDialogControllerForTesting() {
diff --git a/chrome/browser/ui/autofill/country_combobox_model.h b/chrome/browser/ui/autofill/country_combobox_model.h
index e4772d4..397bbab 100644
--- a/chrome/browser/ui/autofill/country_combobox_model.h
+++ b/chrome/browser/ui/autofill/country_combobox_model.h
@@ -32,9 +32,9 @@ class CountryComboboxModel : public ui::ComboboxModel {
                     const base::Callback<bool(const std::string&)>& filter);
 
   // ui::ComboboxModel implementation:
-  virtual int GetItemCount() const OVERRIDE;
-  virtual base::string16 GetItemAt(int index) OVERRIDE;
-  virtual bool IsItemSeparatorAt(int index) OVERRIDE;
+  virtual int GetItemCount() const override;
+  virtual base::string16 GetItemAt(int index) override;
+  virtual bool IsItemSeparatorAt(int index) override;
 
   const std::vector<AutofillCountry*>& countries() const {
     return countries_.get();
diff --git a/chrome/browser/ui/autofill/data_model_wrapper.h b/chrome/browser/ui/autofill/data_model_wrapper.h
index f755697..d5808c5 100644
--- a/chrome/browser/ui/autofill/data_model_wrapper.h
+++ b/chrome/browser/ui/autofill/data_model_wrapper.h
@@ -98,10 +98,10 @@ class AutofillProfileWrapper : public DataModelWrapper {
                          size_t variant);
   virtual ~AutofillProfileWrapper();
 
-  virtual base::string16 GetInfo(const AutofillType& type) const OVERRIDE;
+  virtual base::string16 GetInfo(const AutofillType& type) const override;
   virtual base::string16 GetInfoForDisplay(const AutofillType& type) const
-      OVERRIDE;
-  virtual const std::string& GetLanguageCode() const OVERRIDE;
+      override;
+  virtual const std::string& GetLanguageCode() const override;
 
  protected:
   // Returns the variant that should be used when dealing with an element that
@@ -125,7 +125,7 @@ class AutofillShippingAddressWrapper : public AutofillProfileWrapper {
   explicit AutofillShippingAddressWrapper(const AutofillProfile* profile);
   virtual ~AutofillShippingAddressWrapper();
 
-  virtual base::string16 GetInfo(const AutofillType& type) const OVERRIDE;
+  virtual base::string16 GetInfo(const AutofillType& type) const override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AutofillShippingAddressWrapper);
@@ -137,11 +137,11 @@ class AutofillCreditCardWrapper : public DataModelWrapper {
   explicit AutofillCreditCardWrapper(const CreditCard* card);
   virtual ~AutofillCreditCardWrapper();
 
-  virtual base::string16 GetInfo(const AutofillType& type) const OVERRIDE;
-  virtual gfx::Image GetIcon() OVERRIDE;
+  virtual base::string16 GetInfo(const AutofillType& type) const override;
+  virtual gfx::Image GetIcon() override;
   virtual bool GetDisplayText(base::string16* vertically_compact,
-                              base::string16* horizontally_compact) OVERRIDE;
-  virtual const std::string& GetLanguageCode() const OVERRIDE;
+                              base::string16* horizontally_compact) override;
+  virtual const std::string& GetLanguageCode() const override;
 
  private:
   const CreditCard* card_;
@@ -155,12 +155,12 @@ class WalletAddressWrapper : public DataModelWrapper {
   explicit WalletAddressWrapper(const wallet::Address* address);
   virtual ~WalletAddressWrapper();
 
-  virtual base::string16 GetInfo(const AutofillType& type) const OVERRIDE;
+  virtual base::string16 GetInfo(const AutofillType& type) const override;
   virtual base::string16 GetInfoForDisplay(const AutofillType& type) const
-      OVERRIDE;
+      override;
   virtual bool GetDisplayText(base::string16* vertically_compact,
-                              base::string16* horizontally_compact) OVERRIDE;
-  virtual const std::string& GetLanguageCode() const OVERRIDE;
+                              base::string16* horizontally_compact) override;
+  virtual const std::string& GetLanguageCode() const override;
 
  private:
   const wallet::Address* address_;
@@ -175,13 +175,13 @@ class WalletInstrumentWrapper : public DataModelWrapper {
       const wallet::WalletItems::MaskedInstrument* instrument);
   virtual ~WalletInstrumentWrapper();
 
-  virtual base::string16 GetInfo(const AutofillType& type) const OVERRIDE;
+  virtual base::string16 GetInfo(const AutofillType& type) const override;
   virtual base::string16 GetInfoForDisplay(const AutofillType& type) const
-      OVERRIDE;
-  virtual gfx::Image GetIcon() OVERRIDE;
+      override;
+  virtual gfx::Image GetIcon() override;
   virtual bool GetDisplayText(base::string16* vertically_compact,
-                              base::string16* horizontally_compact) OVERRIDE;
-  virtual const std::string& GetLanguageCode() const OVERRIDE;
+                              base::string16* horizontally_compact) override;
+  virtual const std::string& GetLanguageCode() const override;
 
  private:
   const wallet::WalletItems::MaskedInstrument* instrument_;
@@ -195,10 +195,10 @@ class FullWalletBillingWrapper : public DataModelWrapper {
   explicit FullWalletBillingWrapper(wallet::FullWallet* full_wallet);
   virtual ~FullWalletBillingWrapper();
 
-  virtual base::string16 GetInfo(const AutofillType& type) const OVERRIDE;
+  virtual base::string16 GetInfo(const AutofillType& type) const override;
   virtual bool GetDisplayText(base::string16* vertically_compact,
-                              base::string16* horizontally_compact) OVERRIDE;
-  virtual const std::string& GetLanguageCode() const OVERRIDE;
+                              base::string16* horizontally_compact) override;
+  virtual const std::string& GetLanguageCode() const override;
 
  private:
   wallet::FullWallet* full_wallet_;
@@ -212,8 +212,8 @@ class FullWalletShippingWrapper : public DataModelWrapper {
   explicit FullWalletShippingWrapper(wallet::FullWallet* full_wallet);
   virtual ~FullWalletShippingWrapper();
 
-  virtual base::string16 GetInfo(const AutofillType& type) const OVERRIDE;
-  virtual const std::string& GetLanguageCode() const OVERRIDE;
+  virtual base::string16 GetInfo(const AutofillType& type) const override;
+  virtual const std::string& GetLanguageCode() const override;
 
  private:
   wallet::FullWallet* full_wallet_;
@@ -228,8 +228,8 @@ class I18nAddressDataWrapper : public DataModelWrapper {
       const ::i18n::addressinput::AddressData* address);
   virtual ~I18nAddressDataWrapper();
 
-  virtual base::string16 GetInfo(const AutofillType& type) const OVERRIDE;
-  virtual const std::string& GetLanguageCode() const OVERRIDE;
+  virtual base::string16 GetInfo(const AutofillType& type) const override;
+  virtual const std::string& GetLanguageCode() const override;
 
  private:
   const ::i18n::addressinput::AddressData* address_;
diff --git a/chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h b/chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h
index 4b3ee00..1a120c4 100644
--- a/chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h
+++ b/chrome/browser/ui/autofill/generated_credit_card_bubble_controller.h
@@ -66,7 +66,7 @@ class GeneratedCreditCardBubbleController
   // content::WebContentsObserver:
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) OVERRIDE;
+      const content::FrameNavigateParams& params) override;
 
   // Returns whether |bubble_| is currently in the process of hiding.
   bool IsHiding() const;
diff --git a/chrome/browser/ui/autofill/generated_credit_card_bubble_controller_unittest.cc b/chrome/browser/ui/autofill/generated_credit_card_bubble_controller_unittest.cc
index de08c51..6508a65 100644
--- a/chrome/browser/ui/autofill/generated_credit_card_bubble_controller_unittest.cc
+++ b/chrome/browser/ui/autofill/generated_credit_card_bubble_controller_unittest.cc
@@ -50,7 +50,7 @@ class GeneratedCreditCardBubbleControllerTest : public testing::Test {
             content::WebContentsTester::CreateTestWebContents(
                 &profile_, NULL)) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     // Attaches immediately to |test_web_contents_| so a test version will exist
     // before a non-test version can be created.
     new TestGeneratedCreditCardBubbleController(test_web_contents_.get());
diff --git a/chrome/browser/ui/autofill/loading_animation.h b/chrome/browser/ui/autofill/loading_animation.h
index 7dec09a..e306c61 100644
--- a/chrome/browser/ui/autofill/loading_animation.h
+++ b/chrome/browser/ui/autofill/loading_animation.h
@@ -17,7 +17,7 @@ class LoadingAnimation : public gfx::LinearAnimation {
   virtual ~LoadingAnimation();
 
   // gfx::Animation implementation.
-  virtual void Step(base::TimeTicks time_now) OVERRIDE;
+  virtual void Step(base::TimeTicks time_now) override;
 
   // Returns the vertical pixel offset for the nth dot.
   double GetCurrentValueForDot(size_t dot_i) const;
diff --git a/chrome/browser/ui/autofill/password_generation_popup_controller_impl.h b/chrome/browser/ui/autofill/password_generation_popup_controller_impl.h
index 12d3df9d..5dc2204 100644
--- a/chrome/browser/ui/autofill/password_generation_popup_controller_impl.h
+++ b/chrome/browser/ui/autofill/password_generation_popup_controller_impl.h
@@ -89,21 +89,21 @@ class PasswordGenerationPopupControllerImpl
 
  private:
   // PasswordGenerationPopupController implementation:
-  virtual void Hide() OVERRIDE;
-  virtual void ViewDestroyed() OVERRIDE;
-  virtual void SetSelectionAtPoint(const gfx::Point& point) OVERRIDE;
-  virtual bool AcceptSelectedLine() OVERRIDE;
-  virtual void SelectionCleared() OVERRIDE;
-  virtual void OnSavedPasswordsLinkClicked() OVERRIDE;
-  virtual int GetMinimumWidth() OVERRIDE;
-  virtual gfx::NativeView container_view() OVERRIDE;
-  virtual const gfx::Rect& popup_bounds() const OVERRIDE;
-  virtual bool display_password() const OVERRIDE;
-  virtual bool password_selected() const OVERRIDE;
-  virtual base::string16 password() const OVERRIDE;
-  virtual base::string16 SuggestedText() OVERRIDE;
-  virtual const base::string16& HelpText() OVERRIDE;
-  virtual const gfx::Range& HelpTextLinkRange() OVERRIDE;
+  virtual void Hide() override;
+  virtual void ViewDestroyed() override;
+  virtual void SetSelectionAtPoint(const gfx::Point& point) override;
+  virtual bool AcceptSelectedLine() override;
+  virtual void SelectionCleared() override;
+  virtual void OnSavedPasswordsLinkClicked() override;
+  virtual int GetMinimumWidth() override;
+  virtual gfx::NativeView container_view() override;
+  virtual const gfx::Rect& popup_bounds() const override;
+  virtual bool display_password() const override;
+  virtual bool password_selected() const override;
+  virtual base::string16 password() const override;
+  virtual base::string16 SuggestedText() override;
+  virtual const base::string16& HelpText() override;
+  virtual const gfx::Range& HelpTextLinkRange() override;
 
   base::WeakPtr<PasswordGenerationPopupControllerImpl> GetWeakPtr();
 
diff --git a/chrome/browser/ui/autofill/password_generation_popup_view_browsertest.cc b/chrome/browser/ui/autofill/password_generation_popup_view_browsertest.cc
index 8f4665e..4e1c118 100644
--- a/chrome/browser/ui/autofill/password_generation_popup_view_browsertest.cc
+++ b/chrome/browser/ui/autofill/password_generation_popup_view_browsertest.cc
@@ -39,7 +39,7 @@ class TestPasswordGenerationPopupController :
 
 class PasswordGenerationPopupViewTest : public InProcessBrowserTest {
  public:
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     gfx::NativeView native_view =
         browser()->tab_strip_model()->GetActiveWebContents()->GetNativeView();
 
diff --git a/chrome/browser/ui/autofill/test_generated_credit_card_bubble_controller.h b/chrome/browser/ui/autofill/test_generated_credit_card_bubble_controller.h
index eef69f4..3f3af79 100644
--- a/chrome/browser/ui/autofill/test_generated_credit_card_bubble_controller.h
+++ b/chrome/browser/ui/autofill/test_generated_credit_card_bubble_controller.h
@@ -34,10 +34,10 @@ class TestGeneratedCreditCardBubbleController
 
  protected:
   // GeneratedCreditCardBubbleController:
-  virtual base::WeakPtr<GeneratedCreditCardBubbleView> CreateBubble() OVERRIDE;
-  virtual bool CanShow() const OVERRIDE;
+  virtual base::WeakPtr<GeneratedCreditCardBubbleView> CreateBubble() override;
+  virtual bool CanShow() const override;
   virtual void SetupAndShow(const base::string16& fronting_card_name,
-                            const base::string16& backing_card_name) OVERRIDE;
+                            const base::string16& backing_card_name) override;
 
  private:
   // How many bubbles have been shown via this controller.
diff --git a/chrome/browser/ui/autofill/test_generated_credit_card_bubble_view.h b/chrome/browser/ui/autofill/test_generated_credit_card_bubble_view.h
index 5892ff0..5789624 100644
--- a/chrome/browser/ui/autofill/test_generated_credit_card_bubble_view.h
+++ b/chrome/browser/ui/autofill/test_generated_credit_card_bubble_view.h
@@ -29,9 +29,9 @@ class TestGeneratedCreditCardBubbleView : public GeneratedCreditCardBubbleView {
   virtual ~TestGeneratedCreditCardBubbleView();
 
   // GeneratedCreditCardBubbleView:
-  virtual void Show() OVERRIDE;
-  virtual void Hide() OVERRIDE;
-  virtual bool IsHiding() const OVERRIDE;
+  virtual void Show() override;
+  virtual void Hide() override;
+  virtual bool IsHiding() const override;
 
   base::WeakPtr<TestGeneratedCreditCardBubbleView> GetWeakPtr();
 
diff --git a/chrome/browser/ui/autofill/test_popup_controller_common.h b/chrome/browser/ui/autofill/test_popup_controller_common.h
index 82af3d6..4102cf8 100644
--- a/chrome/browser/ui/autofill/test_popup_controller_common.h
+++ b/chrome/browser/ui/autofill/test_popup_controller_common.h
@@ -21,7 +21,7 @@ class TestPopupControllerCommon : public PopupControllerCommon {
  protected:
   // Returns |display_|
   virtual gfx::Display GetDisplayNearestPoint(
-      const gfx::Point& point) const OVERRIDE;
+      const gfx::Point& point) const override;
 
  private:
   gfx::Display display_;
diff --git a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
index 951f855..6bfcc9f 100644
--- a/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
+++ b/chrome/browser/ui/blocked_content/popup_blocker_browsertest.cc
@@ -61,7 +61,7 @@ class CountRenderViewHosts : public content::NotificationObserver {
  private:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE {
+                       const content::NotificationDetails& details) override {
     count_++;
   }
 
@@ -81,7 +81,7 @@ class CloseObserver : public content::WebContentsObserver {
     close_loop_.Run();
   }
 
-  virtual void WebContentsDestroyed() OVERRIDE {
+  virtual void WebContentsDestroyed() override {
     close_loop_.Quit();
   }
 
@@ -96,7 +96,7 @@ class PopupBlockerBrowserTest : public InProcessBrowserTest {
   PopupBlockerBrowserTest() {}
   virtual ~PopupBlockerBrowserTest() {}
 
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     InProcessBrowserTest::SetUpOnMainThread();
 
     host_resolver()->AddRule("*", "127.0.0.1");
diff --git a/chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h b/chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h
index 9821fc6..aab5960 100644
--- a/chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h
+++ b/chrome/browser/ui/blocked_content/popup_blocker_tab_helper.h
@@ -51,7 +51,7 @@ class PopupBlockerTabHelper
   // content::WebContentsObserver overrides:
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) OVERRIDE;
+      const content::FrameNavigateParams& params) override;
 
  private:
   struct BlockedRequest;
diff --git a/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h b/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h
index 88e3944..3435484 100644
--- a/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h
+++ b/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate.h
@@ -25,10 +25,10 @@ class BookmarkBubbleSignInDelegate : public BookmarkBubbleDelegate,
   virtual ~BookmarkBubbleSignInDelegate();
 
   // BookmarkBubbleDelegate:
-  virtual void OnSignInLinkClicked() OVERRIDE;
+  virtual void OnSignInLinkClicked() override;
 
   // chrome::BrowserListObserver:
-  virtual void OnBrowserRemoved(Browser* browser) OVERRIDE;
+  virtual void OnBrowserRemoved(Browser* browser) override;
 
   // Makes sure |browser_| points to a valid browser.
   void EnsureBrowser();
diff --git a/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc
index 854daec..87e199c 100644
--- a/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_bubble_sign_in_delegate_unittest.cc
@@ -23,7 +23,7 @@ class BookmarkBubbleSignInDelegateTest : public BrowserWithTestWindowTest {
  public:
   BookmarkBubbleSignInDelegateTest() {}
 
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
  protected:
   class Window : public TestBrowserWindow {
@@ -34,7 +34,7 @@ class BookmarkBubbleSignInDelegateTest : public BrowserWithTestWindowTest {
 
    private:
     // TestBrowserWindow:
-    virtual void Show() OVERRIDE {
+    virtual void Show() override {
       ++show_count_;
     }
 
@@ -44,7 +44,7 @@ class BookmarkBubbleSignInDelegateTest : public BrowserWithTestWindowTest {
     DISALLOW_COPY_AND_ASSIGN(Window);
   };
 
-  virtual BrowserWindow* CreateBrowserWindow() OVERRIDE {
+  virtual BrowserWindow* CreateBrowserWindow() override {
     return new Window();
   }
 
diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h
index 971fb63..fa7b7c9 100644
--- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h
+++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller.h
@@ -62,15 +62,15 @@ class BookmarkContextMenuController : public BaseBookmarkModelObserver,
   ui::SimpleMenuModel* menu_model() { return menu_model_.get(); }
 
   // ui::SimpleMenuModel::Delegate implementation:
-  virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
-  virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
-  virtual bool IsCommandIdVisible(int command_id) const OVERRIDE;
+  virtual bool IsCommandIdChecked(int command_id) const override;
+  virtual bool IsCommandIdEnabled(int command_id) const override;
+  virtual bool IsCommandIdVisible(int command_id) const override;
   virtual bool GetAcceleratorForCommandId(
       int command_id,
-      ui::Accelerator* accelerator) OVERRIDE;
-  virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE;
-  virtual bool IsItemForCommandIdDynamic(int command_id) const OVERRIDE;
-  virtual base::string16 GetLabelForCommandId(int command_id) const OVERRIDE;
+      ui::Accelerator* accelerator) override;
+  virtual void ExecuteCommand(int command_id, int event_flags) override;
+  virtual bool IsItemForCommandIdDynamic(int command_id) const override;
+  virtual base::string16 GetLabelForCommandId(int command_id) const override;
 
   void set_navigator(content::PageNavigator* navigator) {
     navigator_ = navigator;
@@ -88,7 +88,7 @@ class BookmarkContextMenuController : public BaseBookmarkModelObserver,
 
   // Overridden from BaseBookmarkModelObserver:
   // Any change to the model results in closing the menu.
-  virtual void BookmarkModelChanged() OVERRIDE;
+  virtual void BookmarkModelChanged() override;
 
   gfx::NativeWindow parent_window_;
   BookmarkContextMenuControllerDelegate* delegate_;
diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc
index 2d64f64..c916052 100644
--- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc
@@ -34,7 +34,7 @@ using content::WebContents;
 // PageNavigator implementation that records the URL.
 class TestingPageNavigator : public PageNavigator {
  public:
-  virtual WebContents* OpenURL(const OpenURLParams& params) OVERRIDE {
+  virtual WebContents* OpenURL(const OpenURLParams& params) override {
     urls_.push_back(params.url);
     return NULL;
   }
@@ -50,7 +50,7 @@ class BookmarkContextMenuControllerTest : public testing::Test {
         model_(NULL) {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     TestingProfile::Builder builder;
     profile_ = builder.Build();
     profile_->CreateBookmarkModel(true);
@@ -59,7 +59,7 @@ class BookmarkContextMenuControllerTest : public testing::Test {
     AddTestData(model_);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     ui::Clipboard::DestroyClipboardForCurrentThread();
 
     // Flush the message loop to make application verifiers happy.
diff --git a/chrome/browser/ui/bookmarks/bookmark_tab_helper.h b/chrome/browser/ui/bookmarks/bookmark_tab_helper.h
index fcb07db..0e8cd3f 100644
--- a/chrome/browser/ui/bookmarks/bookmark_tab_helper.h
+++ b/chrome/browser/ui/bookmarks/bookmark_tab_helper.h
@@ -66,28 +66,28 @@ class BookmarkTabHelper
   void UpdateStarredStateForCurrentURL();
 
   // Overridden from BaseBookmarkModelObserver:
-  virtual void BookmarkModelChanged() OVERRIDE;
+  virtual void BookmarkModelChanged() override;
   virtual void BookmarkModelLoaded(BookmarkModel* model,
-                                   bool ids_reassigned) OVERRIDE;
+                                   bool ids_reassigned) override;
   virtual void BookmarkNodeAdded(BookmarkModel* model,
                                  const BookmarkNode* parent,
-                                 int index) OVERRIDE;
+                                 int index) override;
   virtual void BookmarkNodeRemoved(BookmarkModel* model,
                                    const BookmarkNode* parent,
                                    int old_index,
                                    const BookmarkNode* node,
-                                   const std::set<GURL>& removed_urls) OVERRIDE;
+                                   const std::set<GURL>& removed_urls) override;
   virtual void BookmarkAllUserNodesRemoved(
       BookmarkModel* model,
-      const std::set<GURL>& removed_urls) OVERRIDE;
+      const std::set<GURL>& removed_urls) override;
 
   virtual void BookmarkNodeChanged(BookmarkModel* model,
-                                   const BookmarkNode* node) OVERRIDE;
+                                   const BookmarkNode* node) override;
 
   // Overridden from content::WebContentsObserver:
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) OVERRIDE;
+      const content::FrameNavigateParams& params) override;
 
   // Whether the current URL is starred.
   bool is_starred_;
diff --git a/chrome/browser/ui/bookmarks/bookmark_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_unittest.cc
index 0d150b7..b3af174 100644
--- a/chrome/browser/ui/bookmarks/bookmark_unittest.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_unittest.cc
@@ -47,7 +47,7 @@ class BookmarkInstantExtendedTest : public BrowserWithTestWindowTest {
   }
 
  protected:
-  virtual TestingProfile* CreateProfile() OVERRIDE {
+  virtual TestingProfile* CreateProfile() override {
     TestingProfile* profile = BrowserWithTestWindowTest::CreateProfile();
     // TemplateURLService is normally NULL during testing. Instant extended
     // needs this service so set a custom factory function.
diff --git a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h
index 5489bb7e..7e61f85 100644
--- a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h
+++ b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model.h
@@ -27,44 +27,44 @@ class RecentlyUsedFoldersComboModel : public ui::ComboboxModel,
   virtual ~RecentlyUsedFoldersComboModel();
 
   // Overridden from ui::ComboboxModel:
-  virtual int GetItemCount() const OVERRIDE;
-  virtual base::string16 GetItemAt(int index) OVERRIDE;
-  virtual bool IsItemSeparatorAt(int index) OVERRIDE;
-  virtual int GetDefaultIndex() const OVERRIDE;
-  virtual void AddObserver(ui::ComboboxModelObserver* observer) OVERRIDE;
-  virtual void RemoveObserver(ui::ComboboxModelObserver* observer) OVERRIDE;
+  virtual int GetItemCount() const override;
+  virtual base::string16 GetItemAt(int index) override;
+  virtual bool IsItemSeparatorAt(int index) override;
+  virtual int GetDefaultIndex() const override;
+  virtual void AddObserver(ui::ComboboxModelObserver* observer) override;
+  virtual void RemoveObserver(ui::ComboboxModelObserver* observer) override;
 
   // Overriden from BookmarkModelObserver:
   virtual void BookmarkModelLoaded(BookmarkModel* model,
-                                   bool ids_reassigned) OVERRIDE;
-  virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
+                                   bool ids_reassigned) override;
+  virtual void BookmarkModelBeingDeleted(BookmarkModel* model) override;
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
                                  int old_index,
                                  const BookmarkNode* new_parent,
-                                 int new_index) OVERRIDE;
+                                 int new_index) override;
   virtual void BookmarkNodeAdded(BookmarkModel* model,
                                  const BookmarkNode* parent,
-                                 int index) OVERRIDE;
+                                 int index) override;
   virtual void OnWillRemoveBookmarks(BookmarkModel* model,
                                      const BookmarkNode* parent,
                                      int old_index,
-                                     const BookmarkNode* node) OVERRIDE;
+                                     const BookmarkNode* node) override;
   virtual void BookmarkNodeRemoved(BookmarkModel* model,
                                    const BookmarkNode* parent,
                                    int old_index,
                                    const BookmarkNode* node,
-                                   const std::set<GURL>& removed_urls) OVERRIDE;
+                                   const std::set<GURL>& removed_urls) override;
   virtual void BookmarkNodeChanged(BookmarkModel* model,
-                                   const BookmarkNode* node) OVERRIDE;
+                                   const BookmarkNode* node) override;
   virtual void BookmarkNodeFaviconChanged(BookmarkModel* model,
-                                          const BookmarkNode* node) OVERRIDE;
+                                          const BookmarkNode* node) override;
   virtual void BookmarkNodeChildrenReordered(
       BookmarkModel* model,
-      const BookmarkNode* node) OVERRIDE;
+      const BookmarkNode* node) override;
   virtual void BookmarkAllUserNodesRemoved(
       BookmarkModel* model,
-      const std::set<GURL>& removed_urls) OVERRIDE;
+      const std::set<GURL>& removed_urls) override;
 
   // If necessary this function moves |node| into the corresponding folder for
   // the given |selected_index|.
diff --git a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc
index 5e1cc85..89b8905 100644
--- a/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc
+++ b/chrome/browser/ui/bookmarks/recently_used_folders_combo_model_unittest.cc
@@ -32,7 +32,7 @@ class TestComboboxModelObserver : public ui::ComboboxModelObserver {
   }
 
   // ComboboxModelObserver:
-  virtual void OnComboboxModelChanged(ui::ComboboxModel* model) OVERRIDE {
+  virtual void OnComboboxModelChanged(ui::ComboboxModel* model) override {
     changed_ = true;
   }
 
@@ -46,8 +46,8 @@ class RecentlyUsedFoldersComboModelTest : public testing::Test {
  public:
   RecentlyUsedFoldersComboModelTest();
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
  protected:
   BookmarkModel* GetModel();
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 43446d2..1766a7b 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -311,11 +311,11 @@ class Browser::InterstitialObserver : public content::WebContentsObserver {
         browser_(browser) {
   }
 
-  virtual void DidAttachInterstitialPage() OVERRIDE {
+  virtual void DidAttachInterstitialPage() override {
     browser_->UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
   }
 
-  virtual void DidDetachInterstitialPage() OVERRIDE {
+  virtual void DidDetachInterstitialPage() override {
     browser_->UpdateBookmarkBarState(BOOKMARK_BAR_STATE_CHANGE_TAB_STATE);
   }
 
diff --git a/chrome/browser/ui/browser.h b/chrome/browser/ui/browser.h
index 94e4c9d..472215a 100644
--- a/chrome/browser/ui/browser.h
+++ b/chrome/browser/ui/browser.h
@@ -400,60 +400,60 @@ class Browser : public TabStripModelObserver,
 
   // Overridden from content::PageNavigator:
   virtual content::WebContents* OpenURL(
-      const content::OpenURLParams& params) OVERRIDE;
+      const content::OpenURLParams& params) override;
 
   // Overridden from TabStripModelObserver:
   virtual void TabInsertedAt(content::WebContents* contents,
                              int index,
-                             bool foreground) OVERRIDE;
+                             bool foreground) override;
   virtual void TabClosingAt(TabStripModel* tab_strip_model,
                             content::WebContents* contents,
-                            int index) OVERRIDE;
+                            int index) override;
   virtual void TabDetachedAt(content::WebContents* contents,
-                             int index) OVERRIDE;
-  virtual void TabDeactivated(content::WebContents* contents) OVERRIDE;
+                             int index) override;
+  virtual void TabDeactivated(content::WebContents* contents) override;
   virtual void ActiveTabChanged(content::WebContents* old_contents,
                                 content::WebContents* new_contents,
                                 int index,
-                                int reason) OVERRIDE;
+                                int reason) override;
   virtual void TabMoved(content::WebContents* contents,
                         int from_index,
-                        int to_index) OVERRIDE;
+                        int to_index) override;
   virtual void TabReplacedAt(TabStripModel* tab_strip_model,
                              content::WebContents* old_contents,
                              content::WebContents* new_contents,
-                             int index) OVERRIDE;
+                             int index) override;
   virtual void TabPinnedStateChanged(content::WebContents* contents,
-                                     int index) OVERRIDE;
-  virtual void TabStripEmpty() OVERRIDE;
+                                     int index) override;
+  virtual void TabStripEmpty() override;
 
   // Overridden from content::WebContentsDelegate:
-  virtual bool CanOverscrollContent() const OVERRIDE;
-  virtual bool ShouldPreserveAbortedURLs(content::WebContents* source) OVERRIDE;
+  virtual bool CanOverscrollContent() const override;
+  virtual bool ShouldPreserveAbortedURLs(content::WebContents* source) override;
   virtual bool PreHandleKeyboardEvent(
       content::WebContents* source,
       const content::NativeWebKeyboardEvent& event,
-      bool* is_keyboard_shortcut) OVERRIDE;
+      bool* is_keyboard_shortcut) override;
   virtual void HandleKeyboardEvent(
       content::WebContents* source,
-      const content::NativeWebKeyboardEvent& event) OVERRIDE;
-  virtual void OverscrollUpdate(int delta_y) OVERRIDE;
+      const content::NativeWebKeyboardEvent& event) override;
+  virtual void OverscrollUpdate(int delta_y) override;
   virtual void ShowValidationMessage(content::WebContents* web_contents,
                                      const gfx::Rect& anchor_in_root_view,
                                      const base::string16& main_text,
-                                     const base::string16& sub_text) OVERRIDE;
+                                     const base::string16& sub_text) override;
   virtual void HideValidationMessage(
-      content::WebContents* web_contents) OVERRIDE;
+      content::WebContents* web_contents) override;
   virtual void MoveValidationMessage(
       content::WebContents* web_contents,
-      const gfx::Rect& anchor_in_root_view) OVERRIDE;
+      const gfx::Rect& anchor_in_root_view) override;
   virtual bool PreHandleGestureEvent(
       content::WebContents* source,
-      const blink::WebGestureEvent& event) OVERRIDE;
+      const blink::WebGestureEvent& event) override;
   virtual bool CanDragEnter(
       content::WebContents* source,
       const content::DropData& data,
-      blink::WebDragOperationsMask operations_allowed) OVERRIDE;
+      blink::WebDragOperationsMask operations_allowed) override;
 
   bool is_type_tabbed() const { return type_ == TYPE_TABBED; }
   bool is_type_popup() const { return type_ == TYPE_POPUP; }
@@ -539,51 +539,51 @@ class Browser : public TabStripModelObserver,
   // Overridden from content::WebContentsDelegate:
   virtual content::WebContents* OpenURLFromTab(
       content::WebContents* source,
-      const content::OpenURLParams& params) OVERRIDE;
+      const content::OpenURLParams& params) override;
   virtual void NavigationStateChanged(
       const content::WebContents* source,
-      content::InvalidateTypes changed_flags) OVERRIDE;
+      content::InvalidateTypes changed_flags) override;
   virtual void VisibleSSLStateChanged(
-      const content::WebContents* source) OVERRIDE;
+      const content::WebContents* source) 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;
-  virtual void ActivateContents(content::WebContents* contents) OVERRIDE;
-  virtual void DeactivateContents(content::WebContents* contents) OVERRIDE;
+                              bool* was_blocked) override;
+  virtual void ActivateContents(content::WebContents* contents) override;
+  virtual void DeactivateContents(content::WebContents* contents) override;
   virtual void LoadingStateChanged(content::WebContents* source,
-                                   bool to_different_document) OVERRIDE;
-  virtual void CloseContents(content::WebContents* source) OVERRIDE;
+                                   bool to_different_document) override;
+  virtual void CloseContents(content::WebContents* source) override;
   virtual void MoveContents(content::WebContents* source,
-                            const gfx::Rect& pos) OVERRIDE;
+                            const gfx::Rect& pos) override;
   virtual bool IsPopupOrPanel(
-      const content::WebContents* source) const OVERRIDE;
+      const content::WebContents* source) const override;
   virtual void UpdateTargetURL(content::WebContents* source,
-                               const GURL& url) OVERRIDE;
+                               const GURL& url) override;
   virtual void ContentsMouseEvent(content::WebContents* source,
                                   const gfx::Point& location,
-                                  bool motion) OVERRIDE;
-  virtual void ContentsZoomChange(bool zoom_in) OVERRIDE;
-  virtual void WebContentsFocused(content::WebContents* content) OVERRIDE;
-  virtual bool TakeFocus(content::WebContents* source, bool reverse) OVERRIDE;
-  virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE;
+                                  bool motion) override;
+  virtual void ContentsZoomChange(bool zoom_in) override;
+  virtual void WebContentsFocused(content::WebContents* content) override;
+  virtual bool TakeFocus(content::WebContents* source, bool reverse) override;
+  virtual gfx::Rect GetRootWindowResizerRect() const override;
   virtual void BeforeUnloadFired(content::WebContents* source,
                                  bool proceed,
-                                 bool* proceed_to_fire_unload) OVERRIDE;
+                                 bool* proceed_to_fire_unload) override;
   virtual bool ShouldFocusLocationBarByDefault(
-      content::WebContents* source) OVERRIDE;
-  virtual void SetFocusToLocationBar(bool select_all) OVERRIDE;
-  virtual int GetExtraRenderViewHeight() const OVERRIDE;
+      content::WebContents* source) override;
+  virtual void SetFocusToLocationBar(bool select_all) override;
+  virtual int GetExtraRenderViewHeight() const override;
   virtual void ViewSourceForTab(content::WebContents* source,
-                                const GURL& page_url) OVERRIDE;
+                                const GURL& page_url) override;
   virtual void ViewSourceForFrame(
       content::WebContents* source,
       const GURL& frame_url,
-      const content::PageState& frame_page_state) OVERRIDE;
+      const content::PageState& frame_page_state) override;
   virtual void ShowRepostFormWarningDialog(
-      content::WebContents* source) OVERRIDE;
+      content::WebContents* source) override;
   virtual bool ShouldCreateWebContents(
       content::WebContents* web_contents,
       int route_id,
@@ -591,126 +591,126 @@ class Browser : public TabStripModelObserver,
       const base::string16& frame_name,
       const GURL& target_url,
       const std::string& partition_id,
-      content::SessionStorageNamespace* session_storage_namespace) OVERRIDE;
+      content::SessionStorageNamespace* session_storage_namespace) override;
   virtual void WebContentsCreated(content::WebContents* source_contents,
                                   int opener_render_frame_id,
                                   const base::string16& frame_name,
                                   const GURL& target_url,
-                                  content::WebContents* new_contents) OVERRIDE;
-  virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE;
-  virtual void RendererResponsive(content::WebContents* source) OVERRIDE;
-  virtual void WorkerCrashed(content::WebContents* source) OVERRIDE;
+                                  content::WebContents* new_contents) override;
+  virtual void RendererUnresponsive(content::WebContents* source) override;
+  virtual void RendererResponsive(content::WebContents* source) override;
+  virtual void WorkerCrashed(content::WebContents* source) override;
   virtual void DidNavigateMainFramePostCommit(
-      content::WebContents* web_contents) OVERRIDE;
+      content::WebContents* web_contents) override;
   virtual void DidNavigateToPendingEntry(
-      content::WebContents* web_contents) OVERRIDE;
+      content::WebContents* web_contents) override;
   virtual content::JavaScriptDialogManager*
-      GetJavaScriptDialogManager() OVERRIDE;
+      GetJavaScriptDialogManager() 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* web_contents,
-      const content::FileChooserParams& params) OVERRIDE;
+      const content::FileChooserParams& params) override;
   virtual void EnumerateDirectory(content::WebContents* web_contents,
                                   int request_id,
-                                  const base::FilePath& path) OVERRIDE;
-  virtual bool EmbedsFullscreenWidget() const OVERRIDE;
+                                  const base::FilePath& path) override;
+  virtual bool EmbedsFullscreenWidget() const override;
   virtual void ToggleFullscreenModeForTab(content::WebContents* web_contents,
-      bool enter_fullscreen) OVERRIDE;
+      bool enter_fullscreen) override;
   virtual bool IsFullscreenForTabOrPending(
-      const content::WebContents* web_contents) const OVERRIDE;
+      const content::WebContents* web_contents) const override;
   virtual void RegisterProtocolHandler(content::WebContents* web_contents,
                                        const std::string& protocol,
                                        const GURL& url,
-                                       bool user_gesture) OVERRIDE;
+                                       bool user_gesture) override;
   virtual void UnregisterProtocolHandler(content::WebContents* web_contents,
                                          const std::string& protocol,
                                          const GURL& url,
-                                         bool user_gesture) OVERRIDE;
+                                         bool user_gesture) override;
   virtual void UpdatePreferredSize(content::WebContents* source,
-                                   const gfx::Size& pref_size) OVERRIDE;
+                                   const gfx::Size& pref_size) override;
   virtual void ResizeDueToAutoResize(content::WebContents* source,
-                                     const gfx::Size& new_size) OVERRIDE;
+                                     const gfx::Size& new_size) override;
   virtual void FindReply(content::WebContents* web_contents,
                          int request_id,
                          int number_of_matches,
                          const gfx::Rect& selection_rect,
                          int active_match_ordinal,
-                         bool final_update) OVERRIDE;
+                         bool final_update) override;
   virtual void RequestToLockMouse(content::WebContents* web_contents,
                                   bool user_gesture,
-                                  bool last_unlocked_by_target) OVERRIDE;
-  virtual void LostMouseLock() OVERRIDE;
+                                  bool last_unlocked_by_target) override;
+  virtual void LostMouseLock() 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;
   virtual bool RequestPpapiBrokerPermission(
       content::WebContents* web_contents,
       const GURL& url,
       const base::FilePath& plugin_path,
-      const base::Callback<void(bool)>& callback) OVERRIDE;
+      const base::Callback<void(bool)>& callback) override;
   virtual gfx::Size GetSizeForNewRenderView(
-      content::WebContents* web_contents) const OVERRIDE;
+      content::WebContents* web_contents) const override;
 
   // Overridden from CoreTabHelperDelegate:
   // Note that the caller is responsible for deleting |old_contents|.
   virtual void SwapTabContents(content::WebContents* old_contents,
                                content::WebContents* new_contents,
                                bool did_start_load,
-                               bool did_finish_load) OVERRIDE;
+                               bool did_finish_load) override;
   virtual bool CanReloadContents(
-      content::WebContents* web_contents) const OVERRIDE;
+      content::WebContents* web_contents) const override;
   virtual bool CanSaveContents(
-      content::WebContents* web_contents) const OVERRIDE;
+      content::WebContents* web_contents) const override;
 
   // Overridden from SearchEngineTabHelperDelegate:
   virtual void ConfirmAddSearchProvider(TemplateURL* template_url,
-                                        Profile* profile) OVERRIDE;
+                                        Profile* profile) override;
 
   // Overridden from SearchTabHelperDelegate:
   virtual void NavigateOnThumbnailClick(
       const GURL& url,
       WindowOpenDisposition disposition,
-      content::WebContents* source_contents) OVERRIDE;
+      content::WebContents* source_contents) override;
   virtual void OnWebContentsInstantSupportDisabled(
-      const content::WebContents* web_contents) OVERRIDE;
-  virtual OmniboxView* GetOmniboxView() OVERRIDE;
-  virtual std::set<std::string> GetOpenUrls() OVERRIDE;
+      const content::WebContents* web_contents) override;
+  virtual OmniboxView* GetOmniboxView() override;
+  virtual std::set<std::string> GetOpenUrls() override;
 
   // Overridden from WebContentsModalDialogManagerDelegate:
   virtual void SetWebContentsBlocked(content::WebContents* web_contents,
-                                     bool blocked) OVERRIDE;
+                                     bool blocked) override;
   virtual web_modal::WebContentsModalDialogHost*
-      GetWebContentsModalDialogHost() OVERRIDE;
+      GetWebContentsModalDialogHost() override;
 
   // Overridden from BookmarkTabHelperDelegate:
   virtual void URLStarredChanged(content::WebContents* web_contents,
-                                 bool starred) OVERRIDE;
+                                 bool starred) override;
 
   // Overridden from ZoomObserver:
   virtual void OnZoomChanged(
-      const ZoomController::ZoomChangedEventData& data) OVERRIDE;
+      const ZoomController::ZoomChangedEventData& data) override;
 
   // Overridden from SelectFileDialog::Listener:
   virtual void FileSelected(const base::FilePath& path,
                             int index,
-                            void* params) OVERRIDE;
+                            void* params) override;
   virtual void FileSelectedWithExtraInfo(
       const ui::SelectedFileInfo& file_info,
       int index,
-      void* params) OVERRIDE;
+      void* params) override;
 
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // Command and state updating ///////////////////////////////////////////////
 
diff --git a/chrome/browser/ui/browser_browsertest.cc b/chrome/browser/ui/browser_browsertest.cc
index c86c59b..67d5d20 100644
--- a/chrome/browser/ui/browser_browsertest.cc
+++ b/chrome/browser/ui/browser_browsertest.cc
@@ -163,7 +163,7 @@ class MockTabStripModelObserver : public TabStripModelObserver {
 
   virtual void TabClosingAt(TabStripModel* tab_strip_model,
                             WebContents* contents,
-                            int index) OVERRIDE {
+                            int index) override {
     ++closing_count_;
   }
 
@@ -185,11 +185,11 @@ class InterstitialObserver : public content::WebContentsObserver {
         detach_callback_(detach_callback) {
   }
 
-  virtual void DidAttachInterstitialPage() OVERRIDE {
+  virtual void DidAttachInterstitialPage() override {
     attach_callback_.Run();
   }
 
-  virtual void DidDetachInterstitialPage() OVERRIDE {
+  virtual void DidDetachInterstitialPage() override {
     detach_callback_.Run();
   }
 
@@ -207,7 +207,7 @@ class TransferHttpsRedirectsContentBrowserClient
   virtual bool ShouldSwapProcessesForRedirect(
       content::ResourceContext* resource_context,
       const GURL& current_url,
-      const GURL& new_url) OVERRIDE {
+      const GURL& new_url) override {
     return new_url.SchemeIs(url::kHttpsScheme);
   }
 };
@@ -244,7 +244,7 @@ class TestInterstitialPage : public content::InterstitialPageDelegate {
     interstitial_page_->DontProceed();
   }
 
-  virtual std::string GetHTMLContents() OVERRIDE {
+  virtual std::string GetHTMLContents() override {
     return "<h1>INTERSTITIAL</h1>";
   }
 
@@ -280,7 +280,7 @@ class RenderViewSizeObserver : public content::WebContentsObserver {
 
   // Cache the size when RenderViewHost is first created.
   virtual void RenderViewCreated(
-      content::RenderViewHost* render_view_host) OVERRIDE {
+      content::RenderViewHost* render_view_host) override {
     render_view_sizes_[render_view_host].rwhv_create_size =
         render_view_host->GetView()->GetViewBounds().size();
   }
@@ -289,7 +289,7 @@ class RenderViewSizeObserver : public content::WebContentsObserver {
   // is pending.
   virtual void DidStartNavigationToPendingEntry(
       const GURL& url,
-      NavigationController::ReloadType reload_type) OVERRIDE {
+      NavigationController::ReloadType reload_type) override {
     if (wcv_resize_insets_.IsEmpty())
       return;
     // Resizing the main browser window by |wcv_resize_insets_| will
@@ -311,7 +311,7 @@ class RenderViewSizeObserver : public content::WebContentsObserver {
   // navigation entry is committed, which is before
   // WebContentsDelegate::DidNavigateMainFramePostCommit is called.
   virtual void NavigationEntryCommitted(
-      const content::LoadCommittedDetails& details) OVERRIDE {
+      const content::LoadCommittedDetails& details) override {
     content::RenderViewHost* rvh = web_contents()->GetRenderViewHost();
     render_view_sizes_[rvh].rwhv_commit_size =
         web_contents()->GetRenderWidgetHostView()->GetViewBounds().size();
@@ -631,11 +631,11 @@ class RedirectObserver : public content::WebContentsObserver {
 
   virtual void DidNavigateAnyFrame(
       const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) OVERRIDE {
+      const content::FrameNavigateParams& params) override {
     params_ = params;
   }
 
-  virtual void WebContentsDestroyed() OVERRIDE {
+  virtual void WebContentsDestroyed() override {
     // Make sure we don't close the tab while the observer is in scope.
     // See http://crbug.com/314036.
     FAIL() << "WebContents closed during navigation (http://crbug.com/314036).";
@@ -847,7 +847,7 @@ class BeforeUnloadAtQuitWithTwoWindows : public InProcessBrowserTest {
   // This test is for testing a specific shutdown behavior. This mimics what
   // happens in InProcessBrowserTest::RunTestOnMainThread and QuitBrowsers, but
   // ensures that it happens through the single IDC_EXIT of the test.
-  virtual void TearDownOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() override {
     // Cycle both the MessageLoop and the Cocoa runloop twice to flush out any
     // Chrome work that generates Cocoa work. Do this twice since there are two
     // Browsers that must be closed.
@@ -2015,7 +2015,7 @@ class MockWebContentsObserver : public WebContentsObserver {
         got_user_gesture_(false) {
   }
 
-  virtual void DidGetUserGesture() OVERRIDE {
+  virtual void DidGetUserGesture() override {
     got_user_gesture_ = true;
   }
 
@@ -2194,7 +2194,7 @@ class KioskModeTest : public BrowserTest {
  public:
   KioskModeTest() {}
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     command_line->AppendSwitch(switches::kKioskMode);
   }
 };
@@ -2219,7 +2219,7 @@ class LaunchBrowserWithNonAsciiUserDatadir : public BrowserTest {
  public:
   LaunchBrowserWithNonAsciiUserDatadir() {}
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     base::FilePath tmp_profile = temp_dir_.path().AppendASCII("tmp_profile");
     tmp_profile = tmp_profile.Append(L"Test Chrome G\u00E9raldine");
@@ -2244,7 +2244,7 @@ class RunInBackgroundTest : public BrowserTest {
  public:
   RunInBackgroundTest() {}
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     command_line->AppendSwitch(switches::kKeepAliveForTest);
   }
 };
@@ -2274,7 +2274,7 @@ class NoStartupWindowTest : public BrowserTest {
  public:
   NoStartupWindowTest() {}
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     command_line->AppendSwitch(switches::kNoStartupWindow);
     command_line->AppendSwitch(switches::kKeepAliveForTest);
   }
@@ -2328,7 +2328,7 @@ class AppModeTest : public BrowserTest {
  public:
   AppModeTest() {}
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     GURL url = ui_test_utils::GetTestUrl(
        base::FilePath(), base::FilePath().AppendASCII("title1.html"));
     command_line->AppendSwitchASCII(switches::kApp, url.spec());
diff --git a/chrome/browser/ui/browser_close_browsertest.cc b/chrome/browser/ui/browser_close_browsertest.cc
index 1ca7f1c..f143c6e 100644
--- a/chrome/browser/ui/browser_close_browsertest.cc
+++ b/chrome/browser/ui/browser_close_browsertest.cc
@@ -77,7 +77,7 @@ class BrowserCloseTest : public InProcessBrowserTest {
   };
 
  protected:
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     BrowserThread::PostTask(
         BrowserThread::IO, FROM_HERE,
         base::Bind(&chrome_browser_net::SetUrlRequestMocksEnabled, true));
diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
index 4e6c9e1..2b733e3 100644
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -136,7 +136,7 @@ class SwitchToMetroUIHandler
 
  private:
   virtual void SetDefaultWebClientUIState(
-      ShellIntegration::DefaultWebClientUIState state) OVERRIDE {
+      ShellIntegration::DefaultWebClientUIState state) override {
     switch (state) {
       case ShellIntegration::STATE_PROCESSING:
         return;
@@ -157,7 +157,7 @@ class SwitchToMetroUIHandler
     delete this;
   }
 
-  virtual void OnSetAsDefaultConcluded(bool success)  OVERRIDE {
+  virtual void OnSetAsDefaultConcluded(bool success)  override {
     if (!success) {
       delete this;
       return;
@@ -166,7 +166,7 @@ class SwitchToMetroUIHandler
     default_browser_worker_->StartCheckIsDefault();
   }
 
-  virtual bool IsInteractiveSetDefaultPermitted() OVERRIDE {
+  virtual bool IsInteractiveSetDefaultPermitted() override {
     return true;
   }
 
@@ -845,11 +845,11 @@ class BrowserCommandController::InterstitialObserver
         controller_(controller) {
   }
 
-  virtual void DidAttachInterstitialPage() OVERRIDE {
+  virtual void DidAttachInterstitialPage() override {
     controller_->UpdateCommandsForTabState();
   }
 
-  virtual void DidDetachInterstitialPage() OVERRIDE {
+  virtual void DidDetachInterstitialPage() override {
     controller_->UpdateCommandsForTabState();
   }
 
diff --git a/chrome/browser/ui/browser_command_controller.h b/chrome/browser/ui/browser_command_controller.h
index f3cb342..62e43865 100644
--- a/chrome/browser/ui/browser_command_controller.h
+++ b/chrome/browser/ui/browser_command_controller.h
@@ -80,25 +80,25 @@ class BrowserCommandController : public CommandUpdaterDelegate,
   // Overridden from CommandUpdaterDelegate:
   virtual void ExecuteCommandWithDisposition(
       int id,
-      WindowOpenDisposition disposition) OVERRIDE;
+      WindowOpenDisposition disposition) override;
 
   // Overridden from TabStripModelObserver:
   virtual void TabInsertedAt(content::WebContents* contents,
                              int index,
-                             bool foreground) OVERRIDE;
+                             bool foreground) override;
   virtual void TabDetachedAt(content::WebContents* contents,
-                             int index) OVERRIDE;
+                             int index) override;
   virtual void TabReplacedAt(TabStripModel* tab_strip_model,
                              content::WebContents* old_contents,
                              content::WebContents* new_contents,
-                             int index) OVERRIDE;
+                             int index) override;
   virtual void TabBlockedStateChanged(content::WebContents* contents,
-                                      int index) OVERRIDE;
+                                      int index) override;
 
   // Overridden from TabRestoreServiceObserver:
-  virtual void TabRestoreServiceChanged(TabRestoreService* service) OVERRIDE;
-  virtual void TabRestoreServiceDestroyed(TabRestoreService* service) OVERRIDE;
-  virtual void TabRestoreServiceLoaded(TabRestoreService* service) OVERRIDE;
+  virtual void TabRestoreServiceChanged(TabRestoreService* service) override;
+  virtual void TabRestoreServiceDestroyed(TabRestoreService* service) override;
+  virtual void TabRestoreServiceLoaded(TabRestoreService* service) override;
 
   // Returns true if the regular Chrome UI (not the fullscreen one and
   // not the single-tab one) is shown. Used for updating window command states
diff --git a/chrome/browser/ui/browser_command_controller_unittest.cc b/chrome/browser/ui/browser_command_controller_unittest.cc
index a796437..d387eb4 100644
--- a/chrome/browser/ui/browser_command_controller_unittest.cc
+++ b/chrome/browser/ui/browser_command_controller_unittest.cc
@@ -309,17 +309,17 @@ class FullscreenTestBrowserWindow : public TestBrowserWindow {
   virtual ~FullscreenTestBrowserWindow() {}
 
   // TestBrowserWindow overrides:
-  virtual bool ShouldHideUIForFullscreen() const OVERRIDE {
+  virtual bool ShouldHideUIForFullscreen() const override {
     return fullscreen_;
   }
-  virtual bool IsFullscreen() const OVERRIDE {
+  virtual bool IsFullscreen() const override {
     return fullscreen_;
   }
   virtual void EnterFullscreen(
-      const GURL& url, FullscreenExitBubbleType type) OVERRIDE {
+      const GURL& url, FullscreenExitBubbleType type) override {
     fullscreen_ = true;
   }
-  virtual void ExitFullscreen() OVERRIDE {
+  virtual void ExitFullscreen() override {
     fullscreen_ = false;
   }
 
@@ -337,7 +337,7 @@ class BrowserCommandControllerFullscreenTest
   virtual ~BrowserCommandControllerFullscreenTest() {}
 
   // BrowserWithTestWindowTest overrides:
-  virtual BrowserWindow* CreateBrowserWindow() OVERRIDE {
+  virtual BrowserWindow* CreateBrowserWindow() override {
     return new FullscreenTestBrowserWindow;
   }
 
diff --git a/chrome/browser/ui/browser_content_setting_bubble_model_delegate.h b/chrome/browser/ui/browser_content_setting_bubble_model_delegate.h
index 8d35928..7a07628 100644
--- a/chrome/browser/ui/browser_content_setting_bubble_model_delegate.h
+++ b/chrome/browser/ui/browser_content_setting_bubble_model_delegate.h
@@ -21,9 +21,9 @@ class BrowserContentSettingBubbleModelDelegate
 
   // ContentSettingBubbleModelDelegate implementation:
   virtual void ShowCollectedCookiesDialog(
-      content::WebContents* web_contents) OVERRIDE;
-  virtual void ShowContentSettingsPage(ContentSettingsType type) OVERRIDE;
-  virtual void ShowLearnMorePage(ContentSettingsType type) OVERRIDE;
+      content::WebContents* web_contents) override;
+  virtual void ShowContentSettingsPage(ContentSettingsType type) override;
+  virtual void ShowLearnMorePage(ContentSettingsType type) override;
 
  private:
   Browser* browser_;
diff --git a/chrome/browser/ui/browser_content_translate_driver_observer.h b/chrome/browser/ui/browser_content_translate_driver_observer.h
index eeb00a1..aeef5bf 100644
--- a/chrome/browser/ui/browser_content_translate_driver_observer.h
+++ b/chrome/browser/ui/browser_content_translate_driver_observer.h
@@ -23,8 +23,8 @@ class BrowserContentTranslateDriverObserver
   virtual ~BrowserContentTranslateDriverObserver();
 
   // Overridden from ContentTranslateDriver::Observer
-  virtual void OnIsPageTranslatedChanged(content::WebContents* source) OVERRIDE;
-  virtual void OnTranslateEnabledChanged(content::WebContents* source) OVERRIDE;
+  virtual void OnIsPageTranslatedChanged(content::WebContents* source) override;
+  virtual void OnTranslateEnabledChanged(content::WebContents* source) override;
 
  private:
   Browser* browser_;
diff --git a/chrome/browser/ui/browser_focus_uitest.cc b/chrome/browser/ui/browser_focus_uitest.cc
index 3b81b33..d13fa7b 100644
--- a/chrome/browser/ui/browser_focus_uitest.cc
+++ b/chrome/browser/ui/browser_focus_uitest.cc
@@ -65,7 +65,7 @@ const char kTypicalPage[] = "/focus/typical_page.html";
 class BrowserFocusTest : public InProcessBrowserTest {
  public:
    // InProcessBrowserTest overrides:
-   virtual void SetUpOnMainThread() OVERRIDE {
+   virtual void SetUpOnMainThread() override {
      ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
    }
 
@@ -145,8 +145,8 @@ class WaitForInterstitial : public content::WebContentsObserver {
     runner_->Run();
   }
 
-  virtual void DidAttachInterstitialPage() OVERRIDE { runner_->Quit(); }
-  virtual void DidDetachInterstitialPage() OVERRIDE { NOTREACHED(); }
+  virtual void DidAttachInterstitialPage() override { runner_->Quit(); }
+  virtual void DidDetachInterstitialPage() override { NOTREACHED(); }
 
  private:
   scoped_refptr<content::MessageLoopRunner> runner_;
@@ -172,7 +172,7 @@ class TestInterstitialPage : public content::InterstitialPageDelegate {
     EXPECT_TRUE(tab->ShowingInterstitialPage());
   }
 
-  virtual std::string GetHTMLContents() OVERRIDE { return html_contents_; }
+  virtual std::string GetHTMLContents() override { return html_contents_; }
 
   RenderViewHost* render_view_host() {
     return interstitial_page_->GetRenderViewHostForTesting();
diff --git a/chrome/browser/ui/browser_instant_controller.h b/chrome/browser/ui/browser_instant_controller.h
index 3953c69..1402bfb 100644
--- a/chrome/browser/ui/browser_instant_controller.h
+++ b/chrome/browser/ui/browser_instant_controller.h
@@ -50,10 +50,10 @@ class BrowserInstantController : public SearchModelObserver,
  private:
   // SearchModelObserver:
   virtual void ModelChanged(const SearchModel::State& old_state,
-                            const SearchModel::State& new_state) OVERRIDE;
+                            const SearchModel::State& new_state) override;
 
   // InstantServiceObserver:
-  virtual void DefaultSearchProviderChanged() OVERRIDE;
+  virtual void DefaultSearchProviderChanged() override;
 
   // Replaces the contents at tab |index| with |new_contents| and deletes the
   // existing contents.
diff --git a/chrome/browser/ui/browser_instant_controller_unittest.cc b/chrome/browser/ui/browser_instant_controller_unittest.cc
index ffd06dc..fffd928 100644
--- a/chrome/browser/ui/browser_instant_controller_unittest.cc
+++ b/chrome/browser/ui/browser_instant_controller_unittest.cc
@@ -27,7 +27,7 @@ namespace {
 
 class BrowserInstantControllerTest : public InstantUnitTestBase {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
         "EmbeddedSearch", "Group1 use_cacheable_ntp:1"));
     InstantUnitTestBase::SetUp();
@@ -64,7 +64,7 @@ class FakeWebContentsObserver : public content::WebContentsObserver {
 
   virtual void DidStartNavigationToPendingEntry(
       const GURL& url,
-      content::NavigationController::ReloadType reload_type) OVERRIDE {
+      content::NavigationController::ReloadType reload_type) override {
     if (url_ == url)
       num_reloads_++;
   }
diff --git a/chrome/browser/ui/browser_navigator_browsertest.h b/chrome/browser/ui/browser_navigator_browsertest.h
index 2027e83..06aabee 100644
--- a/chrome/browser/ui/browser_navigator_browsertest.h
+++ b/chrome/browser/ui/browser_navigator_browsertest.h
@@ -44,12 +44,12 @@ class BrowserNavigatorTest : public InProcessBrowserTest,
   void RunDoNothingIfIncognitoIsForcedTest(const GURL& url);
 
   // InProcessBrowserTest:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   bool OpenPOSTURLInNewForegroundTabAndGetTitle(const GURL& url,
                                                 const std::string& post_data,
diff --git a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc b/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
index 98052b0..ffdf0ea 100644
--- a/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
+++ b/chrome/browser/ui/browser_navigator_browsertest_chromeos.cc
@@ -38,22 +38,22 @@ class TestMultiUserWindowManager : public chrome::MultiUserWindowManager {
 
   // MultiUserWindowManager overrides:
   virtual void SetWindowOwner(
-      aura::Window* window, const std::string& user_id) OVERRIDE;
+      aura::Window* window, const std::string& user_id) override;
   virtual const std::string& GetWindowOwner(
-      aura::Window* window) const OVERRIDE;
+      aura::Window* window) const override;
   virtual void ShowWindowForUser(
-      aura::Window* window, const std::string& user_id) OVERRIDE;
-  virtual bool AreWindowsSharedAmongUsers() const OVERRIDE;
+      aura::Window* window, const std::string& user_id) override;
+  virtual bool AreWindowsSharedAmongUsers() const override;
   virtual void GetOwnersOfVisibleWindows(
-      std::set<std::string>* user_ids) const OVERRIDE;
+      std::set<std::string>* user_ids) const override;
   virtual bool IsWindowOnDesktopOfUser(
       aura::Window* window,
-      const std::string& user_id) const OVERRIDE;
+      const std::string& user_id) const override;
   virtual const std::string& GetUserPresentingWindow(
-      aura::Window* window) const OVERRIDE;
-  virtual void AddUser(content::BrowserContext* profile) OVERRIDE;
-  virtual void AddObserver(Observer* observer) OVERRIDE;
-  virtual void RemoveObserver(Observer* observer) OVERRIDE;
+      aura::Window* window) const override;
+  virtual void AddUser(content::BrowserContext* profile) override;
+  virtual void AddObserver(Observer* observer) override;
+  virtual void RemoveObserver(Observer* observer) override;
 
  private:
   // The window of the visiting browser.
@@ -154,7 +154,7 @@ GURL GetGoogleURL() {
 // Subclass that tests navigation while in the Guest session.
 class BrowserGuestSessionNavigatorTest: public BrowserNavigatorTest {
  protected:
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     CommandLine command_line_copy = *command_line;
     command_line_copy.AppendSwitchASCII(
         chromeos::switches::kLoginProfile, "user");
diff --git a/chrome/browser/ui/browser_tab_restore_service_delegate.h b/chrome/browser/ui/browser_tab_restore_service_delegate.h
index 3827efd..aa1ea22 100644
--- a/chrome/browser/ui/browser_tab_restore_service_delegate.h
+++ b/chrome/browser/ui/browser_tab_restore_service_delegate.h
@@ -22,14 +22,14 @@ class BrowserTabRestoreServiceDelegate : public TabRestoreServiceDelegate {
   virtual ~BrowserTabRestoreServiceDelegate() {}
 
   // Overridden from TabRestoreServiceDelegate:
-  virtual void ShowBrowserWindow() OVERRIDE;
-  virtual const SessionID& GetSessionID() const OVERRIDE;
-  virtual int GetTabCount() const OVERRIDE;
-  virtual int GetSelectedIndex() const OVERRIDE;
-  virtual std::string GetAppName() const OVERRIDE;
-  virtual content::WebContents* GetWebContentsAt(int index) const OVERRIDE;
-  virtual content::WebContents* GetActiveWebContents() const OVERRIDE;
-  virtual bool IsTabPinned(int index) const OVERRIDE;
+  virtual void ShowBrowserWindow() override;
+  virtual const SessionID& GetSessionID() const override;
+  virtual int GetTabCount() const override;
+  virtual int GetSelectedIndex() const override;
+  virtual std::string GetAppName() const override;
+  virtual content::WebContents* GetWebContentsAt(int index) const override;
+  virtual content::WebContents* GetActiveWebContents() const override;
+  virtual bool IsTabPinned(int index) const override;
   virtual content::WebContents* AddRestoredTab(
       const std::vector<sessions::SerializedNavigationEntry>& navigations,
       int tab_index,
@@ -39,15 +39,15 @@ class BrowserTabRestoreServiceDelegate : public TabRestoreServiceDelegate {
       bool pin,
       bool from_last_session,
       content::SessionStorageNamespace* storage_namespace,
-      const std::string& user_agent_override) OVERRIDE;
+      const std::string& user_agent_override) override;
   virtual content::WebContents* ReplaceRestoredTab(
       const std::vector<sessions::SerializedNavigationEntry>& navigations,
       int selected_navigation,
       bool from_last_session,
       const std::string& extension_app_id,
       content::SessionStorageNamespace* session_storage_namespace,
-      const std::string& user_agent_override) OVERRIDE;
-  virtual void CloseTab() OVERRIDE;
+      const std::string& user_agent_override) override;
+  virtual void CloseTab() override;
 
  private:
   Browser* browser_;
diff --git a/chrome/browser/ui/browser_tab_restorer.cc b/chrome/browser/ui/browser_tab_restorer.cc
index 708970e..ec706f0 100644
--- a/chrome/browser/ui/browser_tab_restorer.cc
+++ b/chrome/browser/ui/browser_tab_restorer.cc
@@ -37,12 +37,12 @@ class BrowserTabRestorer : public TabRestoreServiceObserver,
   explicit BrowserTabRestorer(Browser* browser);
 
   // TabRestoreServiceObserver:
-  virtual void TabRestoreServiceChanged(TabRestoreService* service) OVERRIDE;
-  virtual void TabRestoreServiceDestroyed(TabRestoreService* service) OVERRIDE;
-  virtual void TabRestoreServiceLoaded(TabRestoreService* service) OVERRIDE;
+  virtual void TabRestoreServiceChanged(TabRestoreService* service) override;
+  virtual void TabRestoreServiceDestroyed(TabRestoreService* service) override;
+  virtual void TabRestoreServiceLoaded(TabRestoreService* service) override;
 
   // BrowserListObserver:
-  virtual void OnBrowserRemoved(Browser* browser) OVERRIDE;
+  virtual void OnBrowserRemoved(Browser* browser) override;
 
   Browser* browser_;
   TabRestoreService* tab_restore_service_;
diff --git a/chrome/browser/ui/browser_tab_strip_model_delegate.h b/chrome/browser/ui/browser_tab_strip_model_delegate.h
index ce04f47..d8cf48e 100644
--- a/chrome/browser/ui/browser_tab_strip_model_delegate.h
+++ b/chrome/browser/ui/browser_tab_strip_model_delegate.h
@@ -22,24 +22,24 @@ class BrowserTabStripModelDelegate : public TabStripModelDelegate {
   // Overridden from TabStripModelDelegate:
   virtual void AddTabAt(const GURL& url,
                            int index,
-                           bool foreground) OVERRIDE;
+                           bool foreground) override;
   virtual Browser* CreateNewStripWithContents(
       const std::vector<NewStripContents>& contentses,
       const gfx::Rect& window_bounds,
-      bool maximize) OVERRIDE;
-  virtual void WillAddWebContents(content::WebContents* contents) OVERRIDE;
-  virtual int GetDragActions() const OVERRIDE;
-  virtual bool CanDuplicateContentsAt(int index) OVERRIDE;
-  virtual void DuplicateContentsAt(int index) OVERRIDE;
-  virtual void CreateHistoricalTab(content::WebContents* contents) OVERRIDE;
+      bool maximize) override;
+  virtual void WillAddWebContents(content::WebContents* contents) override;
+  virtual int GetDragActions() const override;
+  virtual bool CanDuplicateContentsAt(int index) override;
+  virtual void DuplicateContentsAt(int index) override;
+  virtual void CreateHistoricalTab(content::WebContents* contents) override;
   virtual bool RunUnloadListenerBeforeClosing(
-      content::WebContents* contents) OVERRIDE;
+      content::WebContents* contents) override;
   virtual bool ShouldRunUnloadListenerBeforeClosing(
-      content::WebContents* contents) OVERRIDE;
-  virtual bool CanBookmarkAllTabs() const OVERRIDE;
-  virtual void BookmarkAllTabs() OVERRIDE;
-  virtual RestoreTabType GetRestoreTabType() OVERRIDE;
-  virtual void RestoreTab() OVERRIDE;
+      content::WebContents* contents) override;
+  virtual bool CanBookmarkAllTabs() const override;
+  virtual void BookmarkAllTabs() override;
+  virtual RestoreTabType GetRestoreTabType() override;
+  virtual void RestoreTab() override;
 
   void CloseFrame();
 
diff --git a/chrome/browser/ui/browser_toolbar_model_delegate.h b/chrome/browser/ui/browser_toolbar_model_delegate.h
index f3d831b..df95a88 100644
--- a/chrome/browser/ui/browser_toolbar_model_delegate.h
+++ b/chrome/browser/ui/browser_toolbar_model_delegate.h
@@ -19,8 +19,8 @@ class BrowserToolbarModelDelegate : public ToolbarModelDelegate {
   virtual ~BrowserToolbarModelDelegate();
 
   // ToolbarModelDelegate:
-  virtual content::WebContents* GetActiveWebContents() const OVERRIDE;
-  virtual bool InTabbedBrowser() const OVERRIDE;
+  virtual content::WebContents* GetActiveWebContents() const override;
+  virtual bool InTabbedBrowser() const override;
 
  private:
   Browser* browser_;
diff --git a/chrome/browser/ui/browser_unittest.cc b/chrome/browser/ui/browser_unittest.cc
index d3c0b47..0eb1adb 100644
--- a/chrome/browser/ui/browser_unittest.cc
+++ b/chrome/browser/ui/browser_unittest.cc
@@ -78,13 +78,13 @@ class BrowserBookmarkBarTest : public BrowserWithTestWindowTest {
   }
 
   // BrowserWithTestWindowTest:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     BrowserWithTestWindowTest::SetUp();
     static_cast<BookmarkBarStateTestBrowserWindow*>(
         browser()->window())->set_browser(browser());
   }
 
-  virtual BrowserWindow* CreateBrowserWindow() OVERRIDE {
+  virtual BrowserWindow* CreateBrowserWindow() override {
     return new BookmarkBarStateTestBrowserWindow();
   }
 
@@ -105,7 +105,7 @@ class BrowserBookmarkBarTest : public BrowserWithTestWindowTest {
    private:
     // TestBrowserWindow:
     virtual void BookmarkBarStateChanged(
-        BookmarkBar::AnimateChangeType change_type) OVERRIDE {
+        BookmarkBar::AnimateChangeType change_type) override {
       bookmark_bar_state_ = browser_->bookmark_bar_state();
       TestBrowserWindow::BookmarkBarStateChanged(change_type);
     }
@@ -113,7 +113,7 @@ class BrowserBookmarkBarTest : public BrowserWithTestWindowTest {
     virtual void OnActiveTabChanged(content::WebContents* old_contents,
                                     content::WebContents* new_contents,
                                     int index,
-                                    int reason) OVERRIDE {
+                                    int reason) override {
       bookmark_bar_state_ = browser_->bookmark_bar_state();
       TestBrowserWindow::OnActiveTabChanged(old_contents, new_contents, index,
                                             reason);
diff --git a/chrome/browser/ui/browser_window_state.cc b/chrome/browser/ui/browser_window_state.cc
index 84d9b2e..c783740 100644
--- a/chrome/browser/ui/browser_window_state.cc
+++ b/chrome/browser/ui/browser_window_state.cc
@@ -50,7 +50,7 @@ class WindowPlacementPrefUpdate : public DictionaryPrefUpdate {
 
   virtual ~WindowPlacementPrefUpdate() {}
 
-  virtual base::DictionaryValue* Get() OVERRIDE {
+  virtual base::DictionaryValue* Get() override {
     base::DictionaryValue* all_apps_dict = DictionaryPrefUpdate::Get();
     base::DictionaryValue* this_app_dict = NULL;
     if (!all_apps_dict->GetDictionary(window_name_, &this_app_dict)) {
diff --git a/chrome/browser/ui/certificate_dialogs.cc b/chrome/browser/ui/certificate_dialogs.cc
index 3e63c7b..d4c9715 100644
--- a/chrome/browser/ui/certificate_dialogs.cc
+++ b/chrome/browser/ui/certificate_dialogs.cc
@@ -73,8 +73,8 @@ class Exporter : public ui::SelectFileDialog::Listener {
 
   // SelectFileDialog::Listener implemenation.
   virtual void FileSelected(const base::FilePath& path,
-                            int index, void* params) OVERRIDE;
-  virtual void FileSelectionCanceled(void* params) OVERRIDE;
+                            int index, void* params) override;
+  virtual void FileSelectionCanceled(void* params) override;
  private:
   scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
 
diff --git a/chrome/browser/ui/chrome_select_file_policy.h b/chrome/browser/ui/chrome_select_file_policy.h
index cbe51a3..d4dd6ff 100644
--- a/chrome/browser/ui/chrome_select_file_policy.h
+++ b/chrome/browser/ui/chrome_select_file_policy.h
@@ -22,8 +22,8 @@ class ChromeSelectFilePolicy : public ui::SelectFilePolicy {
   virtual ~ChromeSelectFilePolicy();
 
   // Overridden from ui::SelectFilePolicy:
-  virtual bool CanOpenSelectFileDialog() OVERRIDE;
-  virtual void SelectFileDenied() OVERRIDE;
+  virtual bool CanOpenSelectFileDialog() override;
+  virtual void SelectFileDenied() override;
 
   // Returns true if local state allows showing file pickers.
   static bool FileSelectDialogsAllowed();
diff --git a/chrome/browser/ui/chrome_select_file_policy_unittest.cc b/chrome/browser/ui/chrome_select_file_policy_unittest.cc
index 1c739b5..f6d674d 100644
--- a/chrome/browser/ui/chrome_select_file_policy_unittest.cc
+++ b/chrome/browser/ui/chrome_select_file_policy_unittest.cc
@@ -63,15 +63,15 @@ class FileSelectionUser : public ui::SelectFileDialog::Listener {
 
   // ui::SelectFileDialog::Listener implementation.
   virtual void FileSelected(const base::FilePath& path,
-                            int index, void* params) OVERRIDE {
+                            int index, void* params) override {
     ASSERT_FALSE(file_selection_initialisation_in_progress);
   }
   virtual void MultiFilesSelected(
       const std::vector<base::FilePath>& files,
-      void* params) OVERRIDE {
+      void* params) override {
     ASSERT_FALSE(file_selection_initialisation_in_progress);
   }
-  virtual void FileSelectionCanceled(void* params) OVERRIDE {
+  virtual void FileSelectionCanceled(void* params) override {
     ASSERT_FALSE(file_selection_initialisation_in_progress);
   }
 
diff --git a/chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h b/chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h
index 749debc..a94d060 100644
--- a/chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h
+++ b/chrome/browser/ui/chrome_web_modal_dialog_manager_delegate.h
@@ -18,7 +18,7 @@ class ChromeWebModalDialogManagerDelegate
  protected:
   // Overridden from web_modal::WebContentsModalDialogManagerDelegate:
   virtual bool IsWebContentsVisible(
-      content::WebContents* web_contents) OVERRIDE;
+      content::WebContents* web_contents) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromeWebModalDialogManagerDelegate);
diff --git a/chrome/browser/ui/cocoa/about_ipc_dialog.h b/chrome/browser/ui/cocoa/about_ipc_dialog.h
index b6291d0..983c28f 100644
--- a/chrome/browser/ui/cocoa/about_ipc_dialog.h
+++ b/chrome/browser/ui/cocoa/about_ipc_dialog.h
@@ -25,7 +25,7 @@ class AboutIPCBridge : public IPC::Logging::Consumer {
   virtual ~AboutIPCBridge() { }
 
   // IPC::Logging::Consumer implementation.
-  virtual void Log(const IPC::LogData& data) OVERRIDE;
+  virtual void Log(const IPC::LogData& data) override;
 
  private:
   AboutIPCController* controller_;  // weak; owns me
diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h b/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h
index b1f6b07..c603ca9 100644
--- a/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h
+++ b/chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h
@@ -40,7 +40,7 @@ class BookmarkAppleScriptTest : public CocoaProfileTest {
  public:
   BookmarkAppleScriptTest();
   virtual ~BookmarkAppleScriptTest();
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
  private:
   base::scoped_nsobject<FakeAppDelegate> appDelegate_;
 
diff --git a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm
index 0736b44..b4fd111 100644
--- a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm
+++ b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm
@@ -33,7 +33,7 @@ class AppShimMenuControllerBrowserTest
 
   virtual ~AppShimMenuControllerBrowserTest() {}
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     PlatformAppBrowserTest::SetUpCommandLine(command_line);
   }
 
diff --git a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
index 06b3730..09ac85a 100644
--- a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
+++ b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
@@ -51,26 +51,26 @@ class NativeAppWindowCocoa : public extensions::NativeAppWindow,
                        const extensions::AppWindow::CreateParams& params);
 
   // ui::BaseWindow implementation.
-  virtual bool IsActive() const OVERRIDE;
-  virtual bool IsMaximized() const OVERRIDE;
-  virtual bool IsMinimized() const OVERRIDE;
-  virtual bool IsFullscreen() const OVERRIDE;
-  virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;
-  virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
-  virtual ui::WindowShowState GetRestoredState() const OVERRIDE;
-  virtual gfx::Rect GetBounds() const OVERRIDE;
-  virtual void Show() OVERRIDE;
-  virtual void ShowInactive() OVERRIDE;
-  virtual void Hide() OVERRIDE;
-  virtual void Close() OVERRIDE;
-  virtual void Activate() OVERRIDE;
-  virtual void Deactivate() OVERRIDE;
-  virtual void Maximize() OVERRIDE;
-  virtual void Minimize() OVERRIDE;
-  virtual void Restore() OVERRIDE;
-  virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
-  virtual void FlashFrame(bool flash) OVERRIDE;
-  virtual bool IsAlwaysOnTop() const OVERRIDE;
+  virtual bool IsActive() const override;
+  virtual bool IsMaximized() const override;
+  virtual bool IsMinimized() const override;
+  virtual bool IsFullscreen() const override;
+  virtual gfx::NativeWindow GetNativeWindow() override;
+  virtual gfx::Rect GetRestoredBounds() const override;
+  virtual ui::WindowShowState GetRestoredState() const override;
+  virtual gfx::Rect GetBounds() const override;
+  virtual void Show() override;
+  virtual void ShowInactive() override;
+  virtual void Hide() override;
+  virtual void Close() override;
+  virtual void Activate() override;
+  virtual void Deactivate() override;
+  virtual void Maximize() override;
+  virtual void Minimize() override;
+  virtual void Restore() override;
+  virtual void SetBounds(const gfx::Rect& bounds) override;
+  virtual void FlashFrame(bool flash) override;
+  virtual bool IsAlwaysOnTop() const override;
 
   // Called when the window is about to be closed.
   void WindowWillClose();
@@ -120,49 +120,49 @@ class NativeAppWindowCocoa : public extensions::NativeAppWindow,
 
  protected:
   // NativeAppWindow implementation.
-  virtual void SetFullscreen(int fullscreen_types) OVERRIDE;
-  virtual bool IsFullscreenOrPending() const OVERRIDE;
-  virtual void UpdateWindowIcon() OVERRIDE;
-  virtual void UpdateWindowTitle() OVERRIDE;
-  virtual void UpdateBadgeIcon() OVERRIDE;
-  virtual void UpdateShape(scoped_ptr<SkRegion> region) OVERRIDE;
+  virtual void SetFullscreen(int fullscreen_types) override;
+  virtual bool IsFullscreenOrPending() const override;
+  virtual void UpdateWindowIcon() override;
+  virtual void UpdateWindowTitle() override;
+  virtual void UpdateBadgeIcon() override;
+  virtual void UpdateShape(scoped_ptr<SkRegion> region) override;
   virtual void UpdateDraggableRegions(
-      const std::vector<extensions::DraggableRegion>& regions) OVERRIDE;
-  virtual SkRegion* GetDraggableRegion() OVERRIDE;
+      const std::vector<extensions::DraggableRegion>& regions) override;
+  virtual SkRegion* GetDraggableRegion() override;
   virtual void HandleKeyboardEvent(
-      const content::NativeWebKeyboardEvent& event) OVERRIDE;
-  virtual bool IsFrameless() const OVERRIDE;
-  virtual bool HasFrameColor() const OVERRIDE;
-  virtual SkColor ActiveFrameColor() const OVERRIDE;
-  virtual SkColor InactiveFrameColor() const OVERRIDE;
-  virtual gfx::Insets GetFrameInsets() const OVERRIDE;
-  virtual bool CanHaveAlphaEnabled() const OVERRIDE;
+      const content::NativeWebKeyboardEvent& event) override;
+  virtual bool IsFrameless() const override;
+  virtual bool HasFrameColor() const override;
+  virtual SkColor ActiveFrameColor() const override;
+  virtual SkColor InactiveFrameColor() const override;
+  virtual gfx::Insets GetFrameInsets() const override;
+  virtual bool CanHaveAlphaEnabled() const override;
 
   // These are used to simulate Mac-style hide/show. Since windows can be hidden
   // and shown using the app.window API, this sets is_hidden_with_app_ to
   // differentiate the reason a window was hidden.
-  virtual void ShowWithApp() OVERRIDE;
-  virtual void HideWithApp() OVERRIDE;
-  virtual void UpdateShelfMenu() OVERRIDE;
-  virtual gfx::Size GetContentMinimumSize() const OVERRIDE;
-  virtual gfx::Size GetContentMaximumSize() const OVERRIDE;
+  virtual void ShowWithApp() override;
+  virtual void HideWithApp() override;
+  virtual void UpdateShelfMenu() override;
+  virtual gfx::Size GetContentMinimumSize() const override;
+  virtual gfx::Size GetContentMaximumSize() const override;
   virtual void SetContentSizeConstraints(const gfx::Size& min_size,
-                                         const gfx::Size& max_size) OVERRIDE;
-  virtual void SetVisibleOnAllWorkspaces(bool always_visible) OVERRIDE;
+                                         const gfx::Size& max_size) override;
+  virtual void SetVisibleOnAllWorkspaces(bool always_visible) override;
 
   // WebContentsObserver implementation.
-  virtual void RenderViewCreated(content::RenderViewHost* rvh) OVERRIDE;
+  virtual void RenderViewCreated(content::RenderViewHost* rvh) override;
 
-  virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE;
+  virtual void SetAlwaysOnTop(bool always_on_top) override;
 
   // WebContentsModalDialogHost implementation.
-  virtual gfx::NativeView GetHostView() const OVERRIDE;
-  virtual gfx::Point GetDialogPosition(const gfx::Size& size) OVERRIDE;
-  virtual gfx::Size GetMaximumDialogSize() OVERRIDE;
+  virtual gfx::NativeView GetHostView() const override;
+  virtual gfx::Point GetDialogPosition(const gfx::Size& size) override;
+  virtual gfx::Size GetMaximumDialogSize() override;
   virtual void AddObserver(
-      web_modal::ModalDialogHostObserver* observer) OVERRIDE;
+      web_modal::ModalDialogHostObserver* observer) override;
   virtual void RemoveObserver(
-      web_modal::ModalDialogHostObserver* observer) OVERRIDE;
+      web_modal::ModalDialogHostObserver* observer) override;
 
  private:
   virtual ~NativeAppWindowCocoa();
diff --git a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h
index f8b32fa..9cfc4a8 100644
--- a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h
+++ b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac.h
@@ -20,13 +20,13 @@ class QuitWithAppsController : public NotificationDelegate {
   QuitWithAppsController();
 
   // NotificationDelegate interface.
-  virtual void Display() OVERRIDE;
-  virtual void Error() OVERRIDE;
-  virtual void Close(bool by_user) OVERRIDE;
-  virtual void Click() OVERRIDE;
-  virtual void ButtonClick(int button_index) OVERRIDE;
-  virtual content::WebContents* GetWebContents() const OVERRIDE;
-  virtual std::string id() const OVERRIDE;
+  virtual void Display() override;
+  virtual void Error() override;
+  virtual void Close(bool by_user) override;
+  virtual void Click() override;
+  virtual void ButtonClick(int button_index) override;
+  virtual content::WebContents* GetWebContents() const override;
+  virtual std::string id() const override;
 
   // Attempt to quit Chrome. This will display a notification and return false
   // if there are apps running.
diff --git a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.cc b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.cc
index 26be7f2..86e9b18 100644
--- a/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.cc
+++ b/chrome/browser/ui/cocoa/apps/quit_with_apps_controller_mac_interactive_uitest.cc
@@ -33,7 +33,7 @@ class QuitWithAppsControllerInteractiveTest
 
   virtual ~QuitWithAppsControllerInteractiveTest() {}
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     PlatformAppBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kAppsKeepChromeAliveInTests);
   }
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_account_chooser_unittest.mm b/chrome/browser/ui/cocoa/autofill/autofill_account_chooser_unittest.mm
index 6a443b3..b620191 100644
--- a/chrome/browser/ui/cocoa/autofill/autofill_account_chooser_unittest.mm
+++ b/chrome/browser/ui/cocoa/autofill/autofill_account_chooser_unittest.mm
@@ -36,19 +36,19 @@ class AutofillAccountChooserTest : public ui::CocoaTest {
 
 class MenuDelegate : public ui::SimpleMenuModel::Delegate {
  public:
-  virtual bool IsCommandIdChecked(int command_id) const OVERRIDE {
+  virtual bool IsCommandIdChecked(int command_id) const override {
     return false;
   }
 
-  virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE {
+  virtual bool IsCommandIdEnabled(int command_id) const override {
     return true;
   }
 
   virtual bool GetAcceleratorForCommandId(
         int command_id,
-        ui::Accelerator* accelerator) OVERRIDE { return false; }
+        ui::Accelerator* accelerator) override { return false; }
 
-  virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE {}
+  virtual void ExecuteCommand(int command_id, int event_flags) override {}
 };
 
 }  // namespace
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.h b/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.h
index 8f6bbf9..e8aa620 100644
--- a/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.h
+++ b/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa.h
@@ -33,33 +33,33 @@ class AutofillDialogCocoa : public AutofillDialogView,
   virtual ~AutofillDialogCocoa();
 
   // AutofillDialogView implementation:
-  virtual void Show() OVERRIDE;
-  virtual void Hide() OVERRIDE;
-  virtual void UpdatesStarted() OVERRIDE;
-  virtual void UpdatesFinished() OVERRIDE;
-  virtual void UpdateAccountChooser() OVERRIDE;
-  virtual void UpdateButtonStrip() OVERRIDE;
-  virtual void UpdateOverlay() OVERRIDE;
-  virtual void UpdateDetailArea() OVERRIDE;
-  virtual void UpdateForErrors() OVERRIDE;
-  virtual void UpdateNotificationArea() OVERRIDE;
-  virtual void UpdateSection(DialogSection section) OVERRIDE;
-  virtual void UpdateErrorBubble() OVERRIDE;
+  virtual void Show() override;
+  virtual void Hide() override;
+  virtual void UpdatesStarted() override;
+  virtual void UpdatesFinished() override;
+  virtual void UpdateAccountChooser() override;
+  virtual void UpdateButtonStrip() override;
+  virtual void UpdateOverlay() override;
+  virtual void UpdateDetailArea() override;
+  virtual void UpdateForErrors() override;
+  virtual void UpdateNotificationArea() override;
+  virtual void UpdateSection(DialogSection section) override;
+  virtual void UpdateErrorBubble() override;
   virtual void FillSection(DialogSection section,
-                           ServerFieldType originating_type) OVERRIDE;
+                           ServerFieldType originating_type) override;
   virtual void GetUserInput(DialogSection section,
-                            FieldValueMap* output) OVERRIDE;
-  virtual base::string16 GetCvc() OVERRIDE;
-  virtual bool SaveDetailsLocally() OVERRIDE;
-  virtual const content::NavigationController* ShowSignIn() OVERRIDE;
-  virtual void HideSignIn() OVERRIDE;
-  virtual void ModelChanged() OVERRIDE;
-  virtual void OnSignInResize(const gfx::Size& pref_size) OVERRIDE;
-  virtual void ValidateSection(DialogSection section) OVERRIDE;
+                            FieldValueMap* output) override;
+  virtual base::string16 GetCvc() override;
+  virtual bool SaveDetailsLocally() override;
+  virtual const content::NavigationController* ShowSignIn() override;
+  virtual void HideSignIn() override;
+  virtual void ModelChanged() override;
+  virtual void OnSignInResize(const gfx::Size& pref_size) override;
+  virtual void ValidateSection(DialogSection section) override;
 
   // ConstrainedWindowMacDelegate implementation:
   virtual void OnConstrainedWindowClosed(
-      ConstrainedWindowMac* window) OVERRIDE;
+      ConstrainedWindowMac* window) override;
 
   AutofillDialogViewDelegate* delegate() { return delegate_; }
 
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm b/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm
index cec7285..ff0b580 100644
--- a/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm
+++ b/chrome/browser/ui/cocoa/autofill/autofill_dialog_cocoa_browsertest.mm
@@ -43,7 +43,7 @@ class TestAutofillDialogController : public AutofillDialogControllerImpl {
 
   virtual ~TestAutofillDialogController() {}
 
-  virtual void ViewClosed() OVERRIDE {
+  virtual void ViewClosed() override {
     DCHECK(runner_.get());
     runner_->Quit();
     AutofillDialogControllerImpl::ViewClosed();
@@ -56,7 +56,7 @@ class TestAutofillDialogController : public AutofillDialogControllerImpl {
 
  private:
   // To specify our own metric logger.
-  virtual const AutofillMetrics& GetMetricLogger() const OVERRIDE {
+  virtual const AutofillMetrics& GetMetricLogger() const override {
     return metric_logger_;
   }
 
@@ -72,7 +72,7 @@ class AutofillDialogCocoaBrowserTest : public InProcessBrowserTest {
 
   virtual ~AutofillDialogCocoaBrowserTest() {}
 
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     // Ensure Mac OS X does not pop up a modal dialog for the Address Book.
     autofill::test::DisableSystemServices(browser()->profile()->GetPrefs());
 
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_dialog_view_tester_cocoa.h b/chrome/browser/ui/cocoa/autofill/autofill_dialog_view_tester_cocoa.h
index a451b0c..1ddaa41 100644
--- a/chrome/browser/ui/cocoa/autofill/autofill_dialog_view_tester_cocoa.h
+++ b/chrome/browser/ui/cocoa/autofill/autofill_dialog_view_tester_cocoa.h
@@ -20,19 +20,19 @@ class AutofillDialogViewTesterCocoa: public AutofillDialogViewTester {
   virtual ~AutofillDialogViewTesterCocoa();
 
   // TestableAutofillDialogView implementation:
-  virtual void SubmitForTesting() OVERRIDE;
-  virtual void CancelForTesting() OVERRIDE;
-  virtual base::string16 GetTextContentsOfInput(ServerFieldType type) OVERRIDE;
+  virtual void SubmitForTesting() override;
+  virtual void CancelForTesting() override;
+  virtual base::string16 GetTextContentsOfInput(ServerFieldType type) override;
   virtual void SetTextContentsOfInput(ServerFieldType type,
-                                      const base::string16& contents) OVERRIDE;
+                                      const base::string16& contents) override;
   virtual void SetTextContentsOfSuggestionInput(
       DialogSection section,
-      const base::string16& text) OVERRIDE;
-  virtual void ActivateInput(ServerFieldType type) OVERRIDE;
-  virtual gfx::Size GetSize() const OVERRIDE;
-  virtual content::WebContents* GetSignInWebContents() OVERRIDE;
-  virtual bool IsShowingOverlay() const OVERRIDE;
-  virtual bool IsShowingSection(DialogSection section) const OVERRIDE;
+      const base::string16& text) override;
+  virtual void ActivateInput(ServerFieldType type) override;
+  virtual gfx::Size GetSize() const override;
+  virtual content::WebContents* GetSignInWebContents() override;
+  virtual bool IsShowingOverlay() const override;
+  virtual bool IsShowingSection(DialogSection section) const override;
 
  private:
   AutofillDialogWindowController* controller() const;
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_loading_shield_controller.mm b/chrome/browser/ui/cocoa/autofill/autofill_loading_shield_controller.mm
index 629c8ae..834927b 100644
--- a/chrome/browser/ui/cocoa/autofill/autofill_loading_shield_controller.mm
+++ b/chrome/browser/ui/cocoa/autofill/autofill_loading_shield_controller.mm
@@ -36,7 +36,7 @@ class AutofillLoadingAnimationBridge : public gfx::AnimationDelegate {
   virtual ~AutofillLoadingAnimationBridge() {}
 
   // gfx::AnimationDelegate implementation.
-  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE {
+  virtual void AnimationProgressed(const gfx::Animation* animation) override {
     DCHECK_EQ(animation, &animation_);
     [controller_ relayoutDotsForSteppedAnimation:animation_];
   }
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_popup_view_bridge.h b/chrome/browser/ui/cocoa/autofill/autofill_popup_view_bridge.h
index db19ab2..8de74bc 100644
--- a/chrome/browser/ui/cocoa/autofill/autofill_popup_view_bridge.h
+++ b/chrome/browser/ui/cocoa/autofill/autofill_popup_view_bridge.h
@@ -31,10 +31,10 @@ class AutofillPopupViewBridge : public AutofillPopupView {
   virtual ~AutofillPopupViewBridge();
 
   // AutofillPopupView implementation.
-  virtual void Hide() OVERRIDE;
-  virtual void Show() OVERRIDE;
-  virtual void InvalidateRow(size_t row) OVERRIDE;
-  virtual void UpdateBoundsAndRedrawPopup() OVERRIDE;
+  virtual void Hide() override;
+  virtual void Show() override;
+  virtual void InvalidateRow(size_t row) override;
+  virtual void UpdateBoundsAndRedrawPopup() override;
 
   // Set the initial bounds of the popup, including its placement.
   void SetInitialBounds();
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_sign_in_container.mm b/chrome/browser/ui/cocoa/autofill/autofill_sign_in_container.mm
index c06182c..3cdd447 100644
--- a/chrome/browser/ui/cocoa/autofill/autofill_sign_in_container.mm
+++ b/chrome/browser/ui/cocoa/autofill/autofill_sign_in_container.mm
@@ -40,7 +40,7 @@ class CocoaSignInDelegate : public autofill::AutofillDialogSignInDelegate {
   // to the current window.
   virtual void HandleKeyboardEvent(
       content::WebContents* source,
-      const content::NativeWebKeyboardEvent& event) OVERRIDE;
+      const content::NativeWebKeyboardEvent& event) override;
 
  private:
   NSView* view_;  // WebContentsView, used to redispatch key events.
diff --git a/chrome/browser/ui/cocoa/autofill/autofill_tooltip_controller_unittest.mm b/chrome/browser/ui/cocoa/autofill/autofill_tooltip_controller_unittest.mm
index 63d66a1..3e446da 100644
--- a/chrome/browser/ui/cocoa/autofill/autofill_tooltip_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/autofill/autofill_tooltip_controller_unittest.mm
@@ -12,7 +12,7 @@ namespace {
 
 class AutofillTooltipControllerTest: public ui::CocoaTest {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaTest::SetUp();
     controller_.reset([[AutofillTooltipController alloc]
                            initWithArrowLocation:info_bubble::kTopCenter]);
diff --git a/chrome/browser/ui/cocoa/autofill/generated_credit_card_bubble_cocoa.h b/chrome/browser/ui/cocoa/autofill/generated_credit_card_bubble_cocoa.h
index c6c7685..5607346 100644
--- a/chrome/browser/ui/cocoa/autofill/generated_credit_card_bubble_cocoa.h
+++ b/chrome/browser/ui/cocoa/autofill/generated_credit_card_bubble_cocoa.h
@@ -21,9 +21,9 @@ class GeneratedCreditCardBubbleCocoa : public GeneratedCreditCardBubbleView {
   virtual ~GeneratedCreditCardBubbleCocoa();
 
   // GeneratedCreditCardBubbleView interface.
-  virtual void Show() OVERRIDE;
-  virtual void Hide() OVERRIDE;
-  virtual bool IsHiding() const OVERRIDE;
+  virtual void Show() override;
+  virtual void Hide() override;
+  virtual bool IsHiding() const override;
 
   // Callbacks.
   void OnBubbleClosing();
diff --git a/chrome/browser/ui/cocoa/autofill/new_credit_card_bubble_cocoa.h b/chrome/browser/ui/cocoa/autofill/new_credit_card_bubble_cocoa.h
index 009fa1b..ca87c5de 100644
--- a/chrome/browser/ui/cocoa/autofill/new_credit_card_bubble_cocoa.h
+++ b/chrome/browser/ui/cocoa/autofill/new_credit_card_bubble_cocoa.h
@@ -33,8 +33,8 @@ class NewCreditCardBubbleCocoa : public NewCreditCardBubbleView {
   virtual ~NewCreditCardBubbleCocoa();
 
   // NewCreditCardBubbleView implementation.
-  virtual void Show() OVERRIDE;
-  virtual void Hide() OVERRIDE;
+  virtual void Show() override;
+  virtual void Hide() override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(NewCreditCardBubbleCocoaUnitTest, CloseDeletes);
diff --git a/chrome/browser/ui/cocoa/autofill/new_credit_card_bubble_cocoa_unittest.mm b/chrome/browser/ui/cocoa/autofill/new_credit_card_bubble_cocoa_unittest.mm
index 267d56e..ea8c5b3 100644
--- a/chrome/browser/ui/cocoa/autofill/new_credit_card_bubble_cocoa_unittest.mm
+++ b/chrome/browser/ui/cocoa/autofill/new_credit_card_bubble_cocoa_unittest.mm
@@ -32,7 +32,7 @@ namespace autofill {
 
 class NewCreditCardBubbleCocoaUnitTest : public CocoaProfileTest {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(profile());
 
diff --git a/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_bridge.h b/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_bridge.h
index f4a7fe8..e34a92a 100644
--- a/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_bridge.h
+++ b/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_bridge.h
@@ -30,12 +30,12 @@ class PasswordGenerationPopupViewBridge : public PasswordGenerationPopupView {
   virtual ~PasswordGenerationPopupViewBridge();
 
   // PasswordGenerationPopupView implementation.
-  virtual void Hide() OVERRIDE;
-  virtual void Show() OVERRIDE;
-  virtual gfx::Size GetPreferredSizeOfPasswordView() OVERRIDE;
-  virtual void UpdateBoundsAndRedrawPopup() OVERRIDE;
-  virtual void PasswordSelectionUpdated() OVERRIDE;
-  virtual bool IsPointInPasswordBounds(const gfx::Point& point) OVERRIDE;
+  virtual void Hide() override;
+  virtual void Show() override;
+  virtual gfx::Size GetPreferredSizeOfPasswordView() override;
+  virtual void UpdateBoundsAndRedrawPopup() override;
+  virtual void PasswordSelectionUpdated() override;
+  virtual bool IsPointInPasswordBounds(const gfx::Point& point) override;
 
   // The native Cocoa view.
   base::scoped_nsobject<PasswordGenerationPopupViewCocoa> view_;
diff --git a/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa_unittest.mm b/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa_unittest.mm
index 73ebbfe..925a6dd 100644
--- a/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa_unittest.mm
+++ b/chrome/browser/ui/cocoa/autofill/password_generation_popup_view_cocoa_unittest.mm
@@ -25,31 +25,31 @@ class MockPasswordGenerationPopupController
     : help_text_(base::ASCIIToUTF16("Help me if you can I'm feeling dooown")),
       popup_bounds_(gfx::Rect(0, 0, 200, 100)) {}
 
-  virtual void OnSavedPasswordsLinkClicked() OVERRIDE {}
+  virtual void OnSavedPasswordsLinkClicked() override {}
 
-  virtual int GetMinimumWidth() OVERRIDE { return 200; }
+  virtual int GetMinimumWidth() override { return 200; }
 
-  virtual bool display_password() const OVERRIDE { return true; }
+  virtual bool display_password() const override { return true; }
 
-  virtual bool password_selected() const OVERRIDE { return false; }
+  virtual bool password_selected() const override { return false; }
 
   MOCK_CONST_METHOD0(password, base::string16());
 
-  virtual base::string16 SuggestedText() OVERRIDE {
+  virtual base::string16 SuggestedText() override {
     return base::ASCIIToUTF16("Suggested by Chrome");
   }
 
-  virtual const base::string16& HelpText() OVERRIDE { return help_text_; }
+  virtual const base::string16& HelpText() override { return help_text_; }
 
-  virtual const gfx::Range& HelpTextLinkRange() OVERRIDE { return link_range_; }
+  virtual const gfx::Range& HelpTextLinkRange() override { return link_range_; }
 
   // AutofillPopupViewDelegate implementation.
-  virtual void Hide() OVERRIDE {}
+  virtual void Hide() override {}
   MOCK_METHOD0(ViewDestroyed, void());
-  virtual void SetSelectionAtPoint(const gfx::Point&) OVERRIDE {}
-  virtual bool AcceptSelectedLine() OVERRIDE { return true; }
-  virtual void SelectionCleared() OVERRIDE {}
-  virtual const gfx::Rect& popup_bounds() const OVERRIDE {
+  virtual void SetSelectionAtPoint(const gfx::Point&) override {}
+  virtual bool AcceptSelectedLine() override { return true; }
+  virtual void SelectionCleared() override {}
+  virtual const gfx::Rect& popup_bounds() const override {
     return popup_bounds_;
   }
   MOCK_METHOD0(container_view, gfx::NativeView());
@@ -69,7 +69,7 @@ class PasswordGenerationPopupViewCocoaTest : public CocoaTest {
     : password_(base::ASCIIToUTF16("wow! such password"))
   {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     mock_controller_.reset(new MockPasswordGenerationPopupController);
     EXPECT_CALL(*mock_controller_, password())
         .WillRepeatedly(Return(password_));
diff --git a/chrome/browser/ui/cocoa/base_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/base_bubble_controller_unittest.mm
index 4b28ace..10638b8 100644
--- a/chrome/browser/ui/cocoa/base_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/base_bubble_controller_unittest.mm
@@ -88,7 +88,7 @@ class BaseBubbleControllerTest : public CocoaTest {
  public:
   BaseBubbleControllerTest() : controller_(nil) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     bubble_window_.reset([[InfoBubbleWindow alloc]
         initWithContentRect:NSMakeRect(0, 0, kBubbleWindowWidth,
                                        kBubbleWindowHeight)
@@ -106,7 +106,7 @@ class BaseBubbleControllerTest : public CocoaTest {
     EXPECT_EQ(bubble_window_.get(), [controller_ window]);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // Close our windows.
     [controller_ close];
     bubble_window_.reset();
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h
index 19be858..afd11975 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_bridge.h
@@ -28,32 +28,32 @@ class BookmarkBarBridge : public BookmarkModelObserver {
 
   // Overridden from BookmarkModelObserver:
   virtual void BookmarkModelLoaded(BookmarkModel* model,
-                                   bool ids_reassigned) OVERRIDE;
-  virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
+                                   bool ids_reassigned) override;
+  virtual void BookmarkModelBeingDeleted(BookmarkModel* model) override;
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
                                  int old_index,
                                  const BookmarkNode* new_parent,
-                                 int new_index) OVERRIDE;
+                                 int new_index) override;
   virtual void BookmarkNodeAdded(BookmarkModel* model,
                                  const BookmarkNode* parent,
-                                 int index) OVERRIDE;
+                                 int index) override;
   virtual void BookmarkNodeRemoved(BookmarkModel* model,
                                    const BookmarkNode* parent,
                                    int old_index,
                                    const BookmarkNode* node,
-                                   const std::set<GURL>& removed_urls) OVERRIDE;
+                                   const std::set<GURL>& removed_urls) override;
   virtual void BookmarkAllUserNodesRemoved(
       BookmarkModel* model,
-      const std::set<GURL>& removed_urls) OVERRIDE;
+      const std::set<GURL>& removed_urls) override;
   virtual void BookmarkNodeChanged(BookmarkModel* model,
-                                   const BookmarkNode* node) OVERRIDE;
+                                   const BookmarkNode* node) override;
   virtual void BookmarkNodeFaviconChanged(BookmarkModel* model,
-                                          const BookmarkNode* node) OVERRIDE;
+                                          const BookmarkNode* node) override;
   virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
-                                             const BookmarkNode* node) OVERRIDE;
-  virtual void ExtensiveBookmarkChangesBeginning(BookmarkModel* model) OVERRIDE;
-  virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) OVERRIDE;
+                                             const BookmarkNode* node) override;
+  virtual void ExtensiveBookmarkChangesBeginning(BookmarkModel* model) override;
+  virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) override;
 
  private:
   BookmarkBarController* controller_;  // weak; owns me
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
index a56c10c..688c7ba 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
@@ -210,36 +210,36 @@ class FakeTheme : public ui::ThemeProvider {
   FakeTheme(NSColor* color) : color_(color) {}
   base::scoped_nsobject<NSColor> color_;
 
-  virtual bool UsingSystemTheme() const OVERRIDE {
+  virtual bool UsingSystemTheme() const override {
     return true;
   }
-  virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE {
+  virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const override {
     return NULL;
   }
-  virtual SkColor GetColor(int id) const OVERRIDE { return SkColor(); }
-  virtual int GetDisplayProperty(int id) const OVERRIDE {
+  virtual SkColor GetColor(int id) const override { return SkColor(); }
+  virtual int GetDisplayProperty(int id) const override {
     return -1;
   }
-  virtual bool ShouldUseNativeFrame() const OVERRIDE { return false; }
-  virtual bool HasCustomImage(int id) const OVERRIDE { return false; }
+  virtual bool ShouldUseNativeFrame() const override { return false; }
+  virtual bool HasCustomImage(int id) const override { return false; }
   virtual base::RefCountedMemory* GetRawData(
       int id,
-      ui::ScaleFactor scale_factor) const OVERRIDE {
+      ui::ScaleFactor scale_factor) const override {
     return NULL;
   }
-  virtual NSImage* GetNSImageNamed(int id) const OVERRIDE {
+  virtual NSImage* GetNSImageNamed(int id) const override {
     return nil;
   }
-  virtual NSColor* GetNSImageColorNamed(int id) const OVERRIDE {
+  virtual NSColor* GetNSImageColorNamed(int id) const override {
     return nil;
   }
-  virtual NSColor* GetNSColor(int id) const OVERRIDE {
+  virtual NSColor* GetNSColor(int id) const override {
     return color_.get();
   }
-  virtual NSColor* GetNSColorTint(int id) const OVERRIDE {
+  virtual NSColor* GetNSColorTint(int id) const override {
     return nil;
   }
-  virtual NSGradient* GetNSGradient(int id) const OVERRIDE {
+  virtual NSGradient* GetNSGradient(int id) const override {
     return nil;
   }
 };
@@ -342,7 +342,7 @@ class BookmarkBarControllerTest : public BookmarkBarControllerTestBase {
  public:
   base::scoped_nsobject<BookmarkBarControllerNoOpen> bar_;
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     BookmarkBarControllerTestBase::SetUp();
     ASSERT_TRUE(browser());
     AddCommandLineSwitches();
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm
index 9c7e076..79d886f 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bubble_controller_unittest.mm
@@ -78,7 +78,7 @@ class BookmarkBubbleControllerTest : public CocoaProfileTest {
     edits_ = 0;
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     [controller_ close];
     CocoaProfileTest::TearDown();
   }
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.mm
index 9bcc498..9165d1d 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controller.mm
@@ -28,13 +28,13 @@ class BookmarkContextMenuDelegateBridge :
   virtual ~BookmarkContextMenuDelegateBridge() {
   }
 
-  virtual void CloseMenu() OVERRIDE {
+  virtual void CloseMenu() override {
     [controller_ cancelTracking];
   }
 
   virtual void WillExecuteCommand(
       int command_id,
-      const std::vector<const BookmarkNode*>& bookmarks) OVERRIDE {
+      const std::vector<const BookmarkNode*>& bookmarks) override {
     [controller_ willExecuteCommand:command_id];
   }
 
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
index 910709f..b2a25e0 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.mm
@@ -124,7 +124,7 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver {
   { }
 
   virtual void BookmarkModelLoaded(BookmarkModel* model,
-                                   bool ids_reassigned) OVERRIDE {
+                                   bool ids_reassigned) override {
     [controller_ modelChangedPreserveSelection:YES];
   }
 
@@ -132,14 +132,14 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver {
                                  const BookmarkNode* old_parent,
                                  int old_index,
                                  const BookmarkNode* new_parent,
-                                 int new_index) OVERRIDE {
+                                 int new_index) override {
     if (!importing_ && new_parent->GetChild(new_index)->is_folder())
       [controller_ modelChangedPreserveSelection:YES];
   }
 
   virtual void BookmarkNodeAdded(BookmarkModel* model,
                                  const BookmarkNode* parent,
-                                 int index) OVERRIDE {
+                                 int index) override {
     if (!importing_ && parent->GetChild(index)->is_folder())
       [controller_ modelChangedPreserveSelection:YES];
   }
@@ -149,7 +149,7 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver {
       const BookmarkNode* parent,
       int old_index,
       const BookmarkNode* node,
-      const std::set<GURL>& removed_urls) OVERRIDE {
+      const std::set<GURL>& removed_urls) override {
     [controller_ nodeRemoved:node fromParent:parent];
     if (node->is_folder())
       [controller_ modelChangedPreserveSelection:NO];
@@ -157,36 +157,36 @@ class BookmarkEditorBaseControllerBridge : public BookmarkModelObserver {
 
   virtual void BookmarkAllUserNodesRemoved(
       BookmarkModel* model,
-      const std::set<GURL>& removed_urls) OVERRIDE {
+      const std::set<GURL>& removed_urls) override {
     [controller_ modelChangedPreserveSelection:NO];
   }
 
   virtual void BookmarkNodeChanged(BookmarkModel* model,
-                                   const BookmarkNode* node) OVERRIDE {
+                                   const BookmarkNode* node) override {
     if (!importing_ && node->is_folder())
       [controller_ modelChangedPreserveSelection:YES];
   }
 
   virtual void BookmarkNodeChildrenReordered(
       BookmarkModel* model,
-      const BookmarkNode* node) OVERRIDE {
+      const BookmarkNode* node) override {
     if (!importing_)
       [controller_ modelChangedPreserveSelection:YES];
   }
 
   virtual void BookmarkNodeFaviconChanged(BookmarkModel* model,
-                                          const BookmarkNode* node) OVERRIDE {
+                                          const BookmarkNode* node) override {
     // I care nothing for these 'favicons': I only show folders.
   }
 
   virtual void ExtensiveBookmarkChangesBeginning(
-      BookmarkModel* model) OVERRIDE {
+      BookmarkModel* model) override {
     importing_ = true;
   }
 
   // Invoked after a batch import finishes.  This tells observers to update
   // themselves if they were waiting for the update to finish.
-  virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) OVERRIDE {
+  virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) override {
     importing_ = false;
     [controller_ modelChangedPreserveSelection:YES];
   }
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm
index 43fef3b..131d4ab 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm
@@ -82,7 +82,7 @@ class BookmarkEditorBaseControllerTest : public CocoaProfileTest {
                    configuration:BookmarkEditor::SHOW_TREE];
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(profile());
 
@@ -92,12 +92,12 @@ class BookmarkEditorBaseControllerTest : public CocoaProfileTest {
     [controller_ runAsModalSheet];
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     controller_ = NULL;
     CocoaTest::TearDown();
   }
 
-  virtual Browser* CreateBrowser() OVERRIDE {
+  virtual Browser* CreateBrowser() override {
     Browser::CreateParams native_params(profile(), chrome::GetActiveDesktop());
     return chrome::CreateBrowserWithTestWindowForParams(&native_params);
   }
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm
index a2027e5..24ae3dc 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_controller_unittest.mm
@@ -26,7 +26,7 @@ class BookmarkEditorControllerTest : public CocoaProfileTest {
   base::string16 default_title_;
   BookmarkEditorController* controller_;
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(profile());
 
@@ -48,7 +48,7 @@ class BookmarkEditorControllerTest : public CocoaProfileTest {
     [controller_ runAsModalSheet];
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     controller_ = NULL;
     CocoaProfileTest::TearDown();
   }
@@ -140,7 +140,7 @@ class BookmarkEditorControllerNoNodeTest : public CocoaProfileTest {
  public:
   BookmarkEditorController* controller_;
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(profile());
 
@@ -158,7 +158,7 @@ class BookmarkEditorControllerNoNodeTest : public CocoaProfileTest {
     [controller_ runAsModalSheet];
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     controller_ = NULL;
     CocoaProfileTest::TearDown();
   }
@@ -176,7 +176,7 @@ class BookmarkEditorControllerYesNodeTest : public CocoaProfileTest {
   base::string16 default_title_;
   BookmarkEditorController* controller_;
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(profile());
 
@@ -198,7 +198,7 @@ class BookmarkEditorControllerYesNodeTest : public CocoaProfileTest {
     [controller_ runAsModalSheet];
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     controller_ = NULL;
     CocoaProfileTest::TearDown();
   }
@@ -218,7 +218,7 @@ class BookmarkEditorControllerUtf8NodeTest : public CocoaProfileTest {
  public:
   BookmarkEditorController* controller_;
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(profile());
 
@@ -239,7 +239,7 @@ class BookmarkEditorControllerUtf8NodeTest : public CocoaProfileTest {
     [controller_ runAsModalSheet];
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     controller_ = NULL;
     CocoaProfileTest::TearDown();
   }
@@ -321,7 +321,7 @@ class BookmarkEditorControllerTreeTest : public CocoaProfileTest {
                       configuration:BookmarkEditor::SHOW_TREE];
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(profile());
 
@@ -330,7 +330,7 @@ class BookmarkEditorControllerTreeTest : public CocoaProfileTest {
     [controller_ runAsModalSheet];
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     controller_ = NULL;
     CocoaProfileTest::TearDown();
   }
@@ -457,7 +457,7 @@ TEST_F(BookmarkEditorControllerTreeTest, AddFolderWithFolderSelected) {
 class BookmarkEditorControllerTreeNoNodeTest :
     public BookmarkEditorControllerTreeTest {
  public:
-  virtual BookmarkEditorController* CreateController() OVERRIDE {
+  virtual BookmarkEditorController* CreateController() override {
     return [[BookmarkEditorController alloc]
                initWithParentWindow:test_window()
                             profile:profile()
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h
index a238233..0de22b7 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h
@@ -41,34 +41,34 @@ class BookmarkMenuBridge : public BookmarkModelObserver,
 
   // BookmarkModelObserver:
   virtual void BookmarkModelLoaded(BookmarkModel* model,
-                                   bool ids_reassigned) OVERRIDE;
-  virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
+                                   bool ids_reassigned) override;
+  virtual void BookmarkModelBeingDeleted(BookmarkModel* model) override;
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
                                  int old_index,
                                  const BookmarkNode* new_parent,
-                                 int new_index) OVERRIDE;
+                                 int new_index) override;
   virtual void BookmarkNodeAdded(BookmarkModel* model,
                                  const BookmarkNode* parent,
-                                 int index) OVERRIDE;
+                                 int index) override;
   virtual void BookmarkNodeRemoved(BookmarkModel* model,
                                    const BookmarkNode* parent,
                                    int old_index,
                                    const BookmarkNode* node,
-                                   const std::set<GURL>& removed_urls) OVERRIDE;
+                                   const std::set<GURL>& removed_urls) override;
   virtual void BookmarkAllUserNodesRemoved(
       BookmarkModel* model,
-      const std::set<GURL>& removed_urls) OVERRIDE;
+      const std::set<GURL>& removed_urls) override;
   virtual void BookmarkNodeChanged(BookmarkModel* model,
-                                   const BookmarkNode* node) OVERRIDE;
+                                   const BookmarkNode* node) override;
   virtual void BookmarkNodeFaviconChanged(BookmarkModel* model,
-                                          const BookmarkNode* node) OVERRIDE;
+                                          const BookmarkNode* node) override;
   virtual void BookmarkNodeChildrenReordered(BookmarkModel* model,
-                                             const BookmarkNode* node) OVERRIDE;
+                                             const BookmarkNode* node) override;
 
   // MainMenuItem:
-  virtual void ResetMenu() OVERRIDE;
-  virtual void BuildMenu() OVERRIDE;
+  virtual void ResetMenu() override;
+  virtual void BuildMenu() override;
 
   // Rebuilds the main bookmark menu, if it has been marked invalid.
   void UpdateMenu(NSMenu* bookmark_menu);
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
index 442ddb0..3e3588a 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
@@ -34,7 +34,7 @@ class TestBookmarkMenuBridge : public BookmarkMenuBridge {
 
  protected:
   // Overridden from BookmarkMenuBridge.
-  virtual NSMenu* BookmarkMenu() OVERRIDE {
+  virtual NSMenu* BookmarkMenu() override {
     return menu_;
   }
 };
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h
index b7bf67c..0f598d8 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_model_observer_for_cocoa.h
@@ -46,41 +46,41 @@ class BookmarkModelObserverForCocoa : public BookmarkModelObserver {
   void StopObservingNode(const BookmarkNode* node);
 
   // BookmarkModelObserver:
-  virtual void BookmarkModelBeingDeleted(BookmarkModel* model) OVERRIDE;
+  virtual void BookmarkModelBeingDeleted(BookmarkModel* model) override;
   virtual void BookmarkNodeMoved(BookmarkModel* model,
                                  const BookmarkNode* old_parent,
                                  int old_index,
                                  const BookmarkNode* new_parent,
-                                 int new_index) OVERRIDE;
+                                 int new_index) override;
   virtual void BookmarkNodeRemoved(BookmarkModel* model,
                                    const BookmarkNode* parent,
                                    int old_index,
                                    const BookmarkNode* node,
-                                   const std::set<GURL>& removed_urls) OVERRIDE;
+                                   const std::set<GURL>& removed_urls) override;
   virtual void BookmarkAllUserNodesRemoved(
       BookmarkModel* model,
-      const std::set<GURL>& removed_urls) OVERRIDE;
+      const std::set<GURL>& removed_urls) override;
   virtual void BookmarkNodeChanged(BookmarkModel* model,
-                                   const BookmarkNode* node) OVERRIDE;
+                                   const BookmarkNode* node) override;
 
   // Some notifications we don't care about, but by being pure virtual
   // in the base class we must implement them.
 
   virtual void BookmarkModelLoaded(BookmarkModel* model,
-                                   bool ids_reassigned) OVERRIDE {}
+                                   bool ids_reassigned) override {}
   virtual void BookmarkNodeAdded(BookmarkModel* model,
                                  const BookmarkNode* parent,
-                                 int index) OVERRIDE {}
+                                 int index) override {}
   virtual void BookmarkNodeFaviconChanged(BookmarkModel* model,
-                                          const BookmarkNode* node) OVERRIDE {}
+                                          const BookmarkNode* node) override {}
   virtual void BookmarkNodeChildrenReordered(
       BookmarkModel* model,
-      const BookmarkNode* node) OVERRIDE {}
+      const BookmarkNode* node) override {}
 
   virtual void ExtensiveBookmarkChangesBeginning(
-      BookmarkModel* model) OVERRIDE {}
+      BookmarkModel* model) override {}
 
-  virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) OVERRIDE {}
+  virtual void ExtensiveBookmarkChangesEnded(BookmarkModel* model) override {}
 
  private:
   BookmarkModel* model_;  // Weak; it is owned by a Profile.
diff --git a/chrome/browser/ui/cocoa/browser/zoom_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/browser/zoom_bubble_controller_unittest.mm
index 73a251b..1667f09 100644
--- a/chrome/browser/ui/cocoa/browser/zoom_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/browser/zoom_bubble_controller_unittest.mm
@@ -20,12 +20,12 @@ class TestZoomBubbleControllerDelegate : public ZoomBubbleControllerDelegate {
   TestZoomBubbleControllerDelegate() : did_close_(false) {}
 
   // Get the web contents associated with this bubble.
-  virtual content::WebContents* GetWebContents() OVERRIDE {
+  virtual content::WebContents* GetWebContents() override {
     return NULL;
   }
 
   // Called when the bubble is being closed.
-  virtual void OnClose() OVERRIDE {
+  virtual void OnClose() override {
     did_close_ = true;
   }
 
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa.h b/chrome/browser/ui/cocoa/browser_window_cocoa.h
index 721fe2d..d5c59cf 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa.h
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa.h
@@ -41,130 +41,130 @@ class BrowserWindowCocoa :
   virtual ~BrowserWindowCocoa();
 
   // Overridden from BrowserWindow
-  virtual void Show() OVERRIDE;
-  virtual void ShowInactive() OVERRIDE;
-  virtual void Hide() OVERRIDE;
-  virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
-  virtual void Close() OVERRIDE;
-  virtual void Activate() OVERRIDE;
-  virtual void Deactivate() OVERRIDE;
-  virtual bool IsActive() const OVERRIDE;
-  virtual void FlashFrame(bool flash) OVERRIDE;
-  virtual bool IsAlwaysOnTop() const OVERRIDE;
-  virtual void SetAlwaysOnTop(bool always_on_top) OVERRIDE;
-  virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;
-  virtual BrowserWindowTesting* GetBrowserWindowTesting() OVERRIDE;
-  virtual StatusBubble* GetStatusBubble() OVERRIDE;
-  virtual void UpdateTitleBar() OVERRIDE;
+  virtual void Show() override;
+  virtual void ShowInactive() override;
+  virtual void Hide() override;
+  virtual void SetBounds(const gfx::Rect& bounds) override;
+  virtual void Close() override;
+  virtual void Activate() override;
+  virtual void Deactivate() override;
+  virtual bool IsActive() const override;
+  virtual void FlashFrame(bool flash) override;
+  virtual bool IsAlwaysOnTop() const override;
+  virtual void SetAlwaysOnTop(bool always_on_top) override;
+  virtual gfx::NativeWindow GetNativeWindow() override;
+  virtual BrowserWindowTesting* GetBrowserWindowTesting() override;
+  virtual StatusBubble* GetStatusBubble() override;
+  virtual void UpdateTitleBar() override;
   virtual void BookmarkBarStateChanged(
-      BookmarkBar::AnimateChangeType change_type) OVERRIDE;
-  virtual void UpdateDevTools() OVERRIDE;
-  virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE;
-  virtual void SetStarredState(bool is_starred) OVERRIDE;
-  virtual void SetTranslateIconToggled(bool is_lit) OVERRIDE;
+      BookmarkBar::AnimateChangeType change_type) override;
+  virtual void UpdateDevTools() override;
+  virtual void UpdateLoadingAnimations(bool should_animate) override;
+  virtual void SetStarredState(bool is_starred) override;
+  virtual void SetTranslateIconToggled(bool is_lit) override;
   virtual void OnActiveTabChanged(content::WebContents* old_contents,
                                   content::WebContents* new_contents,
                                   int index,
-                                  int reason) OVERRIDE;
-  virtual void ZoomChangedForActiveTab(bool can_show_bubble) OVERRIDE;
-  virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
-  virtual ui::WindowShowState GetRestoredState() const OVERRIDE;
-  virtual gfx::Rect GetBounds() const OVERRIDE;
-  virtual bool IsMaximized() const OVERRIDE;
-  virtual bool IsMinimized() const OVERRIDE;
-  virtual void Maximize() OVERRIDE;
-  virtual void Minimize() OVERRIDE;
-  virtual void Restore() OVERRIDE;
+                                  int reason) override;
+  virtual void ZoomChangedForActiveTab(bool can_show_bubble) override;
+  virtual gfx::Rect GetRestoredBounds() const override;
+  virtual ui::WindowShowState GetRestoredState() const override;
+  virtual gfx::Rect GetBounds() const override;
+  virtual bool IsMaximized() const override;
+  virtual bool IsMinimized() const override;
+  virtual void Maximize() override;
+  virtual void Minimize() override;
+  virtual void Restore() override;
   virtual void EnterFullscreen(
-      const GURL& url, FullscreenExitBubbleType type) OVERRIDE;
-  virtual void ExitFullscreen() OVERRIDE;
+      const GURL& url, FullscreenExitBubbleType type) override;
+  virtual void ExitFullscreen() override;
   virtual void UpdateFullscreenExitBubbleContent(
       const GURL& url,
-      FullscreenExitBubbleType bubble_type) OVERRIDE;
-  virtual bool ShouldHideUIForFullscreen() const OVERRIDE;
-  virtual bool IsFullscreen() const OVERRIDE;
-  virtual bool IsFullscreenBubbleVisible() const OVERRIDE;
-  virtual LocationBar* GetLocationBar() const OVERRIDE;
-  virtual void SetFocusToLocationBar(bool select_all) OVERRIDE;
-  virtual void UpdateReloadStopState(bool is_loading, bool force) OVERRIDE;
-  virtual void UpdateToolbar(content::WebContents* contents) OVERRIDE;
-  virtual void FocusToolbar() OVERRIDE;
-  virtual void FocusAppMenu() OVERRIDE;
-  virtual void FocusBookmarksToolbar() OVERRIDE;
-  virtual void FocusInfobars() OVERRIDE;
-  virtual void RotatePaneFocus(bool forwards) OVERRIDE;
-  virtual bool IsBookmarkBarVisible() const OVERRIDE;
-  virtual bool IsBookmarkBarAnimating() const OVERRIDE;
-  virtual bool IsTabStripEditable() const OVERRIDE;
-  virtual bool IsToolbarVisible() const OVERRIDE;
-  virtual gfx::Rect GetRootWindowResizerRect() const OVERRIDE;
+      FullscreenExitBubbleType bubble_type) override;
+  virtual bool ShouldHideUIForFullscreen() const override;
+  virtual bool IsFullscreen() const override;
+  virtual bool IsFullscreenBubbleVisible() const override;
+  virtual LocationBar* GetLocationBar() const override;
+  virtual void SetFocusToLocationBar(bool select_all) override;
+  virtual void UpdateReloadStopState(bool is_loading, bool force) override;
+  virtual void UpdateToolbar(content::WebContents* contents) override;
+  virtual void FocusToolbar() override;
+  virtual void FocusAppMenu() override;
+  virtual void FocusBookmarksToolbar() override;
+  virtual void FocusInfobars() override;
+  virtual void RotatePaneFocus(bool forwards) override;
+  virtual bool IsBookmarkBarVisible() const override;
+  virtual bool IsBookmarkBarAnimating() const override;
+  virtual bool IsTabStripEditable() const override;
+  virtual bool IsToolbarVisible() const override;
+  virtual gfx::Rect GetRootWindowResizerRect() const override;
   virtual void ConfirmAddSearchProvider(TemplateURL* template_url,
-                                        Profile* profile) OVERRIDE;
-  virtual void ShowUpdateChromeDialog() OVERRIDE;
+                                        Profile* profile) override;
+  virtual void ShowUpdateChromeDialog() override;
   virtual void ShowBookmarkBubble(const GURL& url,
-                                  bool already_bookmarked) OVERRIDE;
+                                  bool already_bookmarked) override;
   virtual void ShowBookmarkAppBubble(
       const WebApplicationInfo& web_app_info,
-      const std::string& extension_id) OVERRIDE;
+      const std::string& extension_id) override;
   virtual void ShowTranslateBubble(
       content::WebContents* contents,
       translate::TranslateStep step,
       translate::TranslateErrors::Type error_type,
-      bool is_user_gesture) OVERRIDE;
+      bool is_user_gesture) override;
 #if defined(ENABLE_ONE_CLICK_SIGNIN)
   virtual void ShowOneClickSigninBubble(
       OneClickSigninBubbleType type,
       const base::string16& email,
       const base::string16& error_message,
-      const StartSyncCallback& start_sync_callback) OVERRIDE;
+      const StartSyncCallback& start_sync_callback) override;
 #endif
-  virtual bool IsDownloadShelfVisible() const OVERRIDE;
-  virtual DownloadShelf* GetDownloadShelf() OVERRIDE;
+  virtual bool IsDownloadShelfVisible() const override;
+  virtual DownloadShelf* GetDownloadShelf() override;
   virtual void ConfirmBrowserCloseWithPendingDownloads(
       int download_count,
       Browser::DownloadClosePreventionType dialog_type,
       bool app_modal,
-      const base::Callback<void(bool)>& callback) OVERRIDE;
-  virtual void UserChangedTheme() OVERRIDE;
-  virtual int GetExtraRenderViewHeight() const OVERRIDE;
-  virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE;
+      const base::Callback<void(bool)>& callback) override;
+  virtual void UserChangedTheme() override;
+  virtual int GetExtraRenderViewHeight() const override;
+  virtual void WebContentsFocused(content::WebContents* contents) override;
   virtual void ShowWebsiteSettings(Profile* profile,
                                    content::WebContents* web_contents,
                                    const GURL& url,
-                                   const content::SSLStatus& ssl) OVERRIDE;
-  virtual void ShowAppMenu() OVERRIDE;
+                                   const content::SSLStatus& ssl) override;
+  virtual void ShowAppMenu() override;
   virtual bool PreHandleKeyboardEvent(
       const content::NativeWebKeyboardEvent& event,
-      bool* is_keyboard_shortcut) OVERRIDE;
+      bool* is_keyboard_shortcut) override;
   virtual void HandleKeyboardEvent(
-      const content::NativeWebKeyboardEvent& event) OVERRIDE;
-  virtual void Cut() OVERRIDE;
-  virtual void Copy() OVERRIDE;
-  virtual void Paste() OVERRIDE;
-  virtual void EnterFullscreenWithChrome() OVERRIDE;
-  virtual bool IsFullscreenWithChrome() OVERRIDE;
-  virtual bool IsFullscreenWithoutChrome() OVERRIDE;
+      const content::NativeWebKeyboardEvent& event) override;
+  virtual void Cut() override;
+  virtual void Copy() override;
+  virtual void Paste() override;
+  virtual void EnterFullscreenWithChrome() override;
+  virtual bool IsFullscreenWithChrome() override;
+  virtual bool IsFullscreenWithoutChrome() override;
   virtual WindowOpenDisposition GetDispositionForPopupBounds(
-      const gfx::Rect& bounds) OVERRIDE;
-  virtual FindBar* CreateFindBar() OVERRIDE;
+      const gfx::Rect& bounds) override;
+  virtual FindBar* CreateFindBar() override;
   virtual web_modal::WebContentsModalDialogHost*
-      GetWebContentsModalDialogHost() OVERRIDE;
+      GetWebContentsModalDialogHost() override;
   virtual void ShowAvatarBubble(content::WebContents* web_contents,
-                                const gfx::Rect& rect) OVERRIDE;
+                                const gfx::Rect& rect) override;
   virtual void ShowAvatarBubbleFromAvatarButton(AvatarBubbleMode mode,
-      const signin::ManageAccountsParams& manage_accounts_params) OVERRIDE;
-  virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() OVERRIDE;
+      const signin::ManageAccountsParams& manage_accounts_params) override;
+  virtual int GetRenderViewHeightInsetWithDetachedBookmarkBar() override;
   virtual void ExecuteExtensionCommand(
       const extensions::Extension* extension,
-      const extensions::Command& command) OVERRIDE;
+      const extensions::Command& command) override;
 
   // Overridden from ExtensionKeybindingRegistry::Delegate:
   virtual extensions::ActiveTabPermissionGranter*
-      GetActiveTabPermissionGranter() OVERRIDE;
+      GetActiveTabPermissionGranter() override;
 
   // Overridden from SearchModelObserver:
   virtual void ModelChanged(const SearchModel::State& old_state,
-                            const SearchModel::State& new_state) OVERRIDE;
+                            const SearchModel::State& new_state) override;
 
   // Adds the given FindBar cocoa controller to this browser window.
   void AddFindBar(FindBarCocoaController* find_bar_cocoa_controller);
@@ -173,7 +173,7 @@ class BrowserWindowCocoa :
   BrowserWindowController* cocoa_controller() { return controller_; }
 
  protected:
-  virtual void DestroyBrowser() OVERRIDE;
+  virtual void DestroyBrowser() override;
 
  private:
   NSWindow* window() const;  // Accessor for the (current) |NSWindow|.
diff --git a/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm b/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
index 3241584..c8c0e22 100644
--- a/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
+++ b/chrome/browser/ui/cocoa/browser_window_controller_browsertest.mm
@@ -92,7 +92,7 @@ class BrowserWindowControllerTest : public InProcessBrowserTest {
   BrowserWindowControllerTest() : InProcessBrowserTest() {
   }
 
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     [[controller() bookmarkBarController] setStateAnimationsEnabled:NO];
     [[controller() bookmarkBarController] setInnerContentAnimationsEnabled:NO];
   }
diff --git a/chrome/browser/ui/cocoa/browser_window_layout_unittest.mm b/chrome/browser/ui/cocoa/browser_window_layout_unittest.mm
index 88717cd..5364db6 100644
--- a/chrome/browser/ui/cocoa/browser_window_layout_unittest.mm
+++ b/chrome/browser/ui/cocoa/browser_window_layout_unittest.mm
@@ -11,7 +11,7 @@
 class BrowserWindowLayoutTest : public testing::Test {
  public:
   BrowserWindowLayoutTest() {}
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     layout.reset([[BrowserWindowLayout alloc] init]);
 
     [layout setContentViewSize:NSMakeSize(600, 600)];
diff --git a/chrome/browser/ui/cocoa/certificate_viewer_mac.mm b/chrome/browser/ui/cocoa/certificate_viewer_mac.mm
index 8e8ab9c..bfcfec8 100644
--- a/chrome/browser/ui/cocoa/certificate_viewer_mac.mm
+++ b/chrome/browser/ui/cocoa/certificate_viewer_mac.mm
@@ -48,7 +48,7 @@ class SSLCertificateViewerCocoaBridge : public ConstrainedWindowMacDelegate {
 
   // ConstrainedWindowMacDelegate implementation:
   virtual void OnConstrainedWindowClosed(
-      ConstrainedWindowMac * window) OVERRIDE {
+      ConstrainedWindowMac * window) override {
     // |onConstrainedWindowClosed| will delete the sheet which might be still
     // in use higher up the call stack. Wait for the next cycle of the event
     // loop to call this function.
diff --git a/chrome/browser/ui/cocoa/cocoa_profile_test.h b/chrome/browser/ui/cocoa/cocoa_profile_test.h
index 93d681b..b41ab0c 100644
--- a/chrome/browser/ui/cocoa/cocoa_profile_test.h
+++ b/chrome/browser/ui/cocoa/cocoa_profile_test.h
@@ -39,9 +39,9 @@ class CocoaProfileTest : public CocoaTest {
   // succeed, else it will ASSERT and cause the test to fail. Subclasses that
   // do work in SetUp should ASSERT that either browser() or profile() are
   // non-NULL before proceeding after the call to super (this).
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
-  virtual void TearDown() OVERRIDE;
+  virtual void TearDown() override;
 
   TestingProfileManager* testing_profile_manager() {
     return &profile_manager_;
diff --git a/chrome/browser/ui/cocoa/color_chooser_mac.mm b/chrome/browser/ui/cocoa/color_chooser_mac.mm
index 2241818..4d40d0e 100644
--- a/chrome/browser/ui/cocoa/color_chooser_mac.mm
+++ b/chrome/browser/ui/cocoa/color_chooser_mac.mm
@@ -45,8 +45,8 @@ class ColorChooserMac : public content::ColorChooser {
   void DidChooseColorInColorPanel(SkColor color);
   void DidCloseColorPabel();
 
-  virtual void End() OVERRIDE;
-  virtual void SetSelectedColor(SkColor color) OVERRIDE;
+  virtual void End() override;
+  virtual void SetSelectedColor(SkColor color) override;
 
  private:
   static ColorChooserMac* current_color_chooser_;
diff --git a/chrome/browser/ui/cocoa/command_observer_bridge.h b/chrome/browser/ui/cocoa/command_observer_bridge.h
index b77eb71a41..a078068 100644
--- a/chrome/browser/ui/cocoa/command_observer_bridge.h
+++ b/chrome/browser/ui/cocoa/command_observer_bridge.h
@@ -34,7 +34,7 @@ class CommandObserverBridge : public CommandObserver {
  protected:
   // Overridden from CommandObserver
   virtual void EnabledStateChangedForCommand(int command,
-                                             bool enabled) OVERRIDE;
+                                             bool enabled) override;
 
  private:
   id<CommandObserverProtocol> observer_;  // weak, owns me
diff --git a/chrome/browser/ui/cocoa/confirm_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/confirm_bubble_controller_unittest.mm
index 9e58379..9b17587 100644
--- a/chrome/browser/ui/cocoa/confirm_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/confirm_bubble_controller_unittest.mm
@@ -25,16 +25,16 @@ class TestConfirmBubbleModel : public ConfirmBubbleModel {
                          bool* cancel_clicked,
                          bool* link_clicked);
   TestConfirmBubbleModel();
-  virtual ~TestConfirmBubbleModel() OVERRIDE;
-  virtual base::string16 GetTitle() const OVERRIDE;
-  virtual base::string16 GetMessageText() const OVERRIDE;
-  virtual gfx::Image* GetIcon() const OVERRIDE;
-  virtual int GetButtons() const OVERRIDE;
-  virtual base::string16 GetButtonLabel(BubbleButton button) const OVERRIDE;
-  virtual void Accept() OVERRIDE;
-  virtual void Cancel() OVERRIDE;
-  virtual base::string16 GetLinkText() const OVERRIDE;
-  virtual void LinkClicked() OVERRIDE;
+  virtual ~TestConfirmBubbleModel() override;
+  virtual base::string16 GetTitle() const override;
+  virtual base::string16 GetMessageText() const override;
+  virtual gfx::Image* GetIcon() const override;
+  virtual int GetButtons() const override;
+  virtual base::string16 GetButtonLabel(BubbleButton button) const override;
+  virtual void Accept() override;
+  virtual void Cancel() override;
+  virtual base::string16 GetLinkText() const override;
+  virtual void LinkClicked() override;
 
  private:
   bool* model_deleted_;
diff --git a/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm b/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm
index 615337c..42598b6 100644
--- a/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm
+++ b/chrome/browser/ui/cocoa/constrained_web_dialog_delegate_mac.mm
@@ -32,7 +32,7 @@ class ConstrainedWebDialogDelegateMac
       : ConstrainedWebDialogDelegateBase(browser_context, delegate, NULL) {}
 
   // WebDialogWebContentsDelegate interface.
-  virtual void CloseContents(WebContents* source) OVERRIDE {
+  virtual void CloseContents(WebContents* source) override {
     window_->CloseWebContentsModalDialog();
   }
 
@@ -61,28 +61,28 @@ class ConstrainedWebDialogDelegateViewMac :
 
   // ConstrainedWebDialogDelegate interface
   virtual const WebDialogDelegate*
-      GetWebDialogDelegate() const OVERRIDE {
+      GetWebDialogDelegate() const override {
     return impl_->GetWebDialogDelegate();
   }
-  virtual WebDialogDelegate* GetWebDialogDelegate() OVERRIDE {
+  virtual WebDialogDelegate* GetWebDialogDelegate() override {
     return impl_->GetWebDialogDelegate();
   }
-  virtual void OnDialogCloseFromWebUI() OVERRIDE {
+  virtual void OnDialogCloseFromWebUI() override {
     return impl_->OnDialogCloseFromWebUI();
   }
-  virtual void ReleaseWebContentsOnDialogClose() OVERRIDE {
+  virtual void ReleaseWebContentsOnDialogClose() override {
     return impl_->ReleaseWebContentsOnDialogClose();
   }
-  virtual NativeWebContentsModalDialog GetNativeDialog() OVERRIDE {
+  virtual NativeWebContentsModalDialog GetNativeDialog() override {
     return constrained_window_->GetNativeDialog();
   }
-  virtual WebContents* GetWebContents() OVERRIDE {
+  virtual WebContents* GetWebContents() override {
     return impl_->GetWebContents();
   }
 
   // ConstrainedWindowMacDelegate interface
   virtual void OnConstrainedWindowClosed(
-      ConstrainedWindowMac* window) OVERRIDE {
+      ConstrainedWindowMac* window) override {
     if (!impl_->closed_via_webui())
       GetWebDialogDelegate()->OnDialogClosed("");
     delete this;
diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm
index 9628ced..cbf0d35 100644
--- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm
+++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_mac_browsertest.mm
@@ -47,7 +47,7 @@ class ConstrainedWindowMacTest : public InProcessBrowserTest {
     [sheet_ hideSheet];
   }
 
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     AddTabAtIndex(1, GURL("about:blank"), ui::PAGE_TRANSITION_LINK);
     tab0_ = browser()->tab_strip_model()->GetWebContentsAt(0);
     tab1_ = browser()->tab_strip_model()->GetWebContentsAt(1);
diff --git a/chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller_unittest.mm b/chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller_unittest.mm
index 9947e95..51ba100 100644
--- a/chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_controller_unittest.mm
@@ -69,7 +69,7 @@ class ConstrainedWindowSheetControllerTest : public CocoaTest {
   virtual ~ConstrainedWindowSheetControllerTest() {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaTest::SetUp();
 
     // Center the window so that the sheet doesn't go offscreen.
@@ -113,7 +113,7 @@ class ConstrainedWindowSheetControllerTest : public CocoaTest {
     EXPECT_FALSE([ConstrainedWindowSheetController controllerForSheet:sheet_]);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     sheet_.reset();
     sheet_window_.reset();
     CocoaTest::TearDown();
diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h
index 456f5f7..fe4d59d 100644
--- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h
+++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h
@@ -33,7 +33,7 @@ class CollectedCookiesMac : public ConstrainedWindowMacDelegate,
 
   // ConstrainedWindowMacDelegate implementation.
   virtual void OnConstrainedWindowClosed(
-      ConstrainedWindowMac* window) OVERRIDE;
+      ConstrainedWindowMac* window) override;
 
   CollectedCookiesWindowController* sheet_controller() const {
     return sheet_controller_.get();
@@ -43,7 +43,7 @@ class CollectedCookiesMac : public ConstrainedWindowMacDelegate,
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   content::NotificationRegistrar registrar_;
 
diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm
index c4dcab1..68b9a1ae 100644
--- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm
+++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa.mm
@@ -186,7 +186,7 @@ class ContentSettingBubbleWebContentsObserverBridge
   // WebContentsObserver:
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) OVERRIDE {
+      const content::FrameNavigateParams& params) override {
     // Content settings are based on the main frame, so if it switches then
     // close up shop.
     [controller_ closeBubble:nil];
diff --git a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm
index 9a2180a..0a582dd 100644
--- a/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm
+++ b/chrome/browser/ui/cocoa/content_settings/content_setting_bubble_cocoa_unittest.mm
@@ -52,7 +52,7 @@ class ContentSettingBubbleControllerTest
   ContentSettingBubbleController* CreateBubbleController(
       ContentSettingsType settingsType);
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ChromeUnitTestSuite::InitializeProviders();
     ChromeUnitTestSuite::InitializeResourceBundle();
     content_client_.reset(new ChromeContentClient);
diff --git a/chrome/browser/ui/cocoa/content_settings/cookies_tree_controller_bridge.h b/chrome/browser/ui/cocoa/content_settings/cookies_tree_controller_bridge.h
index db6c606..bf7f47c 100644
--- a/chrome/browser/ui/cocoa/content_settings/cookies_tree_controller_bridge.h
+++ b/chrome/browser/ui/cocoa/content_settings/cookies_tree_controller_bridge.h
@@ -20,13 +20,13 @@ class CookiesTreeControllerBridge : public ui::TreeModelObserver {
   virtual void TreeNodesAdded(ui::TreeModel* model,
                               ui::TreeModelNode* parent,
                               int start,
-                              int count) OVERRIDE;
+                              int count) override;
   virtual void TreeNodesRemoved(ui::TreeModel* model,
                                 ui::TreeModelNode* parent,
                                 int start,
-                                int count) OVERRIDE;
+                                int count) override;
   virtual void TreeNodeChanged(ui::TreeModel* model,
-                               ui::TreeModelNode* node) OVERRIDE;
+                               ui::TreeModelNode* node) override;
 
   CocoaCookieTreeNode* cocoa_model() const { return cocoa_model_.get(); }
 
diff --git a/chrome/browser/ui/cocoa/download/background_theme.h b/chrome/browser/ui/cocoa/download/background_theme.h
index a6d7f39..c6a5e67 100644
--- a/chrome/browser/ui/cocoa/download/background_theme.h
+++ b/chrome/browser/ui/cocoa/download/background_theme.h
@@ -16,20 +16,20 @@ class BackgroundTheme : public ui::ThemeProvider {
   virtual ~BackgroundTheme();
 
   // Overridden from ui::ThemeProvider:
-  virtual bool UsingSystemTheme() const OVERRIDE;
-  virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const OVERRIDE;
-  virtual SkColor GetColor(int id) const OVERRIDE;
-  virtual int GetDisplayProperty(int id) const OVERRIDE;
-  virtual bool ShouldUseNativeFrame() const OVERRIDE;
-  virtual bool HasCustomImage(int id) const OVERRIDE;
+  virtual bool UsingSystemTheme() const override;
+  virtual gfx::ImageSkia* GetImageSkiaNamed(int id) const override;
+  virtual SkColor GetColor(int id) const override;
+  virtual int GetDisplayProperty(int id) const override;
+  virtual bool ShouldUseNativeFrame() const override;
+  virtual bool HasCustomImage(int id) const override;
   virtual base::RefCountedMemory* GetRawData(
       int id,
-      ui::ScaleFactor scale_factor) const OVERRIDE;
-  virtual NSImage* GetNSImageNamed(int id) const OVERRIDE;
-  virtual NSColor* GetNSImageColorNamed(int id) const OVERRIDE;
-  virtual NSColor* GetNSColor(int id) const OVERRIDE;
-  virtual NSColor* GetNSColorTint(int id) const OVERRIDE;
-  virtual NSGradient* GetNSGradient(int id) const OVERRIDE;
+      ui::ScaleFactor scale_factor) const override;
+  virtual NSImage* GetNSImageNamed(int id) const override;
+  virtual NSColor* GetNSImageColorNamed(int id) const override;
+  virtual NSColor* GetNSColor(int id) const override;
+  virtual NSColor* GetNSColorTint(int id) const override;
+  virtual NSGradient* GetNSGradient(int id) const override;
 
  private:
   ui::ThemeProvider* provider_;
diff --git a/chrome/browser/ui/cocoa/download/download_item_controller_unittest.mm b/chrome/browser/ui/cocoa/download/download_item_controller_unittest.mm
index 61b3fca..fb17523 100644
--- a/chrome/browser/ui/cocoa/download/download_item_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/download/download_item_controller_unittest.mm
@@ -64,7 +64,7 @@ namespace {
 
 class DownloadItemControllerTest : public CocoaProfileTest {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(browser());
 
@@ -90,7 +90,7 @@ class DownloadItemControllerTest : public CocoaProfileTest {
         Return(content::DownloadItem::TARGET_DISPOSITION_OVERWRITE));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     download_item_.reset();
     [(id)shelf_ verify];
     CocoaProfileTest::TearDown();
diff --git a/chrome/browser/ui/cocoa/download/download_item_mac.h b/chrome/browser/ui/cocoa/download/download_item_mac.h
index 7a576ce..14d80e5 100644
--- a/chrome/browser/ui/cocoa/download/download_item_mac.h
+++ b/chrome/browser/ui/cocoa/download/download_item_mac.h
@@ -32,9 +32,9 @@ class DownloadItemMac : content::DownloadItem::Observer {
   virtual ~DownloadItemMac();
 
   // content::DownloadItem::Observer implementation
-  virtual void OnDownloadUpdated(content::DownloadItem* download) OVERRIDE;
-  virtual void OnDownloadOpened(content::DownloadItem* download) OVERRIDE;
-  virtual void OnDownloadDestroyed(content::DownloadItem* download) OVERRIDE;
+  virtual void OnDownloadUpdated(content::DownloadItem* download) override;
+  virtual void OnDownloadOpened(content::DownloadItem* download) override;
+  virtual void OnDownloadDestroyed(content::DownloadItem* download) override;
 
   DownloadItemModel* download_model() { return &download_model_; }
 
diff --git a/chrome/browser/ui/cocoa/download/download_shelf_controller_unittest.mm b/chrome/browser/ui/cocoa/download/download_shelf_controller_unittest.mm
index 0284773..334eac2 100644
--- a/chrome/browser/ui/cocoa/download/download_shelf_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/download/download_shelf_controller_unittest.mm
@@ -107,7 +107,7 @@ namespace {
 
 class DownloadShelfControllerTest : public CocoaProfileTest {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(browser());
 
@@ -119,7 +119,7 @@ class DownloadShelfControllerTest : public CocoaProfileTest {
     [[test_window() contentView] addSubview:[shelf_ view]];
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     if (shelf_.get()) {
       [shelf_ exiting];
       shelf_.reset();
diff --git a/chrome/browser/ui/cocoa/download/download_shelf_mac.h b/chrome/browser/ui/cocoa/download/download_shelf_mac.h
index 4861883..ada293f 100644
--- a/chrome/browser/ui/cocoa/download/download_shelf_mac.h
+++ b/chrome/browser/ui/cocoa/download/download_shelf_mac.h
@@ -22,14 +22,14 @@ class DownloadShelfMac : public DownloadShelf {
   DownloadShelfMac(Browser* browser, DownloadShelfController* controller);
 
   // DownloadShelf implementation.
-  virtual bool IsShowing() const OVERRIDE;
-  virtual bool IsClosing() const OVERRIDE;
-  virtual Browser* browser() const OVERRIDE;
+  virtual bool IsShowing() const override;
+  virtual bool IsClosing() const override;
+  virtual Browser* browser() const override;
 
  protected:
-  virtual void DoAddDownload(content::DownloadItem* download) OVERRIDE;
-  virtual void DoShow() OVERRIDE;
-  virtual void DoClose(CloseReason reason) OVERRIDE;
+  virtual void DoAddDownload(content::DownloadItem* download) override;
+  virtual void DoShow() override;
+  virtual void DoClose(CloseReason reason) override;
 
  private:
   // The browser that owns this shelf.
diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm
index e5e56be..008b603 100644
--- a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm
+++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm
@@ -52,7 +52,7 @@ class ExtensionActionIconFactoryBridge
   virtual ~ExtensionActionIconFactoryBridge() {}
 
   // ExtensionActionIconFactory::Observer implementation.
-  virtual void OnIconUpdated() OVERRIDE {
+  virtual void OnIconUpdated() override {
     [owner_ updateState];
   }
 
diff --git a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
index 10e1261..497aeba 100644
--- a/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/browser_actions_controller.mm
@@ -194,7 +194,7 @@ class ExtensionServiceObserverBridge
   virtual void Observe(
       int type,
       const content::NotificationSource& source,
-      const content::NotificationDetails& details) OVERRIDE {
+      const content::NotificationDetails& details) override {
     switch (type) {
       case extensions::NOTIFICATION_EXTENSION_HOST_VIEW_SHOULD_CLOSE: {
         ExtensionPopupController* popup = [ExtensionPopupController popup];
@@ -222,28 +222,28 @@ class ExtensionServiceObserverBridge
   // extensions::ExtensionToolbarModel::Observer implementation.
   virtual void ToolbarExtensionAdded(
       const Extension* extension,
-      int index) OVERRIDE {
+      int index) override {
     [owner_ createActionButtonForExtension:extension withIndex:index];
     [owner_ resizeContainerAndAnimate:NO];
   }
 
-  virtual void ToolbarExtensionRemoved(const Extension* extension) OVERRIDE {
+  virtual void ToolbarExtensionRemoved(const Extension* extension) override {
     [owner_ removeActionButtonForExtension:extension];
     [owner_ resizeContainerAndAnimate:NO];
   }
 
   virtual void ToolbarExtensionMoved(const Extension* extension,
-                                     int index) OVERRIDE {
+                                     int index) override {
   }
 
-  virtual void ToolbarExtensionUpdated(const Extension* extension) OVERRIDE {
+  virtual void ToolbarExtensionUpdated(const Extension* extension) override {
     BrowserActionButton* button = [owner_ buttonForExtension:extension];
     if (button)
       [button updateState];
   }
 
   virtual bool ShowExtensionActionPopup(const Extension* extension,
-                                        bool grant_active_tab) OVERRIDE {
+                                        bool grant_active_tab) override {
     // Do not override other popups and only show in active window.
     ExtensionPopupController* popup = [ExtensionPopupController popup];
     if (popup || !browser_->window()->IsActive())
@@ -254,13 +254,13 @@ class ExtensionServiceObserverBridge
                                       shouldGrant:grant_active_tab];
   }
 
-  virtual void ToolbarVisibleCountChanged() OVERRIDE {
+  virtual void ToolbarVisibleCountChanged() override {
   }
 
-  virtual void ToolbarHighlightModeChanged(bool is_highlighting) OVERRIDE {
+  virtual void ToolbarHighlightModeChanged(bool is_highlighting) override {
   }
 
-  virtual Browser* GetBrowser() OVERRIDE {
+  virtual Browser* GetBrowser() override {
     return browser_;
   }
 
diff --git a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.mm
index f540d86..7bc363f 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_action_context_menu_controller.mm
@@ -57,7 +57,7 @@ class AsyncUninstaller : public extensions::ExtensionUninstallDialog::Delegate {
   virtual ~AsyncUninstaller() {}
 
   // ExtensionUninstallDialog::Delegate:
-  virtual void ExtensionUninstallAccepted() OVERRIDE {
+  virtual void ExtensionUninstallAccepted() override {
     extensions::ExtensionSystem::Get(profile_)
         ->extension_service()
         ->UninstallExtension(extension_->id(),
@@ -65,7 +65,7 @@ class AsyncUninstaller : public extensions::ExtensionUninstallDialog::Delegate {
                              base::Bind(&base::DoNothing),
                              NULL);
   }
-  virtual void ExtensionUninstallCanceled() OVERRIDE {}
+  virtual void ExtensionUninstallCanceled() override {}
 
  private:
   // The extension that's being uninstalled.
diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.h b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.h
index b188272..73ccbc8 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.h
+++ b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.h
@@ -34,12 +34,12 @@ class ExtensionInstallDialogController :
   virtual ~ExtensionInstallDialogController();
 
   // ExtensionInstallPrompt::Delegate implementation.
-  virtual void InstallUIProceed() OVERRIDE;
-  virtual void InstallUIAbort(bool user_initiated) OVERRIDE;
+  virtual void InstallUIProceed() override;
+  virtual void InstallUIAbort(bool user_initiated) override;
 
   // ConstrainedWindowMacDelegate implementation.
   virtual void OnConstrainedWindowClosed(
-      ConstrainedWindowMac* window) OVERRIDE;
+      ConstrainedWindowMac* window) override;
 
   ConstrainedWindowMac* constrained_window() const {
     return constrained_window_.get();
diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm
index d458b0e..7fcaff3 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm
@@ -18,7 +18,7 @@ class ExtensionInstallDialogControllerTest : public InProcessBrowserTest {
 public:
   ExtensionInstallDialogControllerTest() {}
 
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     extension_ = chrome::LoadInstallPromptExtension();
   }
 
diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.h b/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.h
index a0738b4..cfe7b73 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.h
+++ b/chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils.h
@@ -20,8 +20,8 @@ class MockExtensionInstallPromptDelegate
         abort_count_(0) {}
 
   // ExtensionInstallPrompt::Delegate overrides.
-  virtual void InstallUIProceed() OVERRIDE;
-  virtual void InstallUIAbort(bool user_initiated) OVERRIDE;
+  virtual void InstallUIProceed() override;
+  virtual void InstallUIAbort(bool user_initiated) override;
 
   int proceed_count() { return proceed_count_; }
   int abort_count() { return abort_count_; }
diff --git a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm
index b7e99b5..25a1563 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_installed_bubble_controller.mm
@@ -74,7 +74,7 @@ class ExtensionLoadedNotificationObserver
   virtual void Observe(
       int type,
       const content::NotificationSource& source,
-      const content::NotificationDetails& details) OVERRIDE {
+      const content::NotificationDetails& details) override {
     if (type == extensions::NOTIFICATION_EXTENSION_LOADED_DEPRECATED) {
       const Extension* extension =
           content::Details<const Extension>(details).ptr();
diff --git a/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h b/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h
index 24850422..fe1e9d8 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h
+++ b/chrome/browser/ui/cocoa/extensions/extension_keybinding_registry_cocoa.h
@@ -56,10 +56,10 @@ class ExtensionKeybindingRegistryCocoa
   // Overridden from ExtensionKeybindingRegistry:
   virtual void AddExtensionKeybinding(
       const extensions::Extension* extension,
-      const std::string& command_name) OVERRIDE;
+      const std::string& command_name) override;
   virtual void RemoveExtensionKeybindingImpl(
       const ui::Accelerator& accelerator,
-      const std::string& command_name) OVERRIDE;
+      const std::string& command_name) override;
 
  private:
   // Keeps track of whether shortcut handling is currently suspended. Shortcuts
diff --git a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
index 5bcb043..ef15675 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_popup_controller.mm
@@ -75,12 +75,12 @@ class ExtensionPopupContainer : public ExtensionViewMac::Container {
 
   virtual void OnExtensionSizeChanged(
       ExtensionViewMac* view,
-      const gfx::Size& new_size) OVERRIDE {
+      const gfx::Size& new_size) override {
     [controller_ onSizeChanged:
         NSMakeSize(new_size.width(), new_size.height())];
   }
 
-  virtual void OnExtensionViewDidShow(ExtensionViewMac* view) OVERRIDE {
+  virtual void OnExtensionViewDidShow(ExtensionViewMac* view) override {
     [controller_ onViewDidShow];
   }
 
@@ -123,7 +123,7 @@ class DevtoolsNotificationBridge : public content::NotificationObserver {
   virtual void Observe(
       int type,
       const content::NotificationSource& source,
-      const content::NotificationDetails& details) OVERRIDE {
+      const content::NotificationDetails& details) override {
     switch (type) {
       case extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING: {
         if (content::Details<extensions::ExtensionViewHost>(
diff --git a/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm b/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm
index 2eb6dc0..b055545 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_uninstall_dialog_cocoa.mm
@@ -28,10 +28,10 @@ class ExtensionUninstallDialogCocoa
   ExtensionUninstallDialogCocoa(Profile* profile,
                                 gfx::NativeWindow parent,
                                 Delegate* delegate);
-  virtual ~ExtensionUninstallDialogCocoa() OVERRIDE;
+  virtual ~ExtensionUninstallDialogCocoa() override;
 
  private:
-  virtual void Show() OVERRIDE;
+  virtual void Show() override;
 };
 
 ExtensionUninstallDialogCocoa::ExtensionUninstallDialogCocoa(
diff --git a/chrome/browser/ui/cocoa/extensions/extension_view_mac.h b/chrome/browser/ui/cocoa/extensions/extension_view_mac.h
index 449b46f..8c3afc5 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_view_mac.h
+++ b/chrome/browser/ui/cocoa/extensions/extension_view_mac.h
@@ -54,15 +54,15 @@ class ExtensionViewMac : public extensions::ExtensionView {
   void WindowFrameChanged();
 
   // extensions::ExtensionView:
-  virtual void Init() OVERRIDE;
-  virtual Browser* GetBrowser() OVERRIDE;
-  virtual gfx::NativeView GetNativeView() OVERRIDE;
-  virtual void ResizeDueToAutoResize(const gfx::Size& new_size) OVERRIDE;
-  virtual void RenderViewCreated() OVERRIDE;
+  virtual void Init() override;
+  virtual Browser* GetBrowser() override;
+  virtual gfx::NativeView GetNativeView() override;
+  virtual void ResizeDueToAutoResize(const gfx::Size& new_size) override;
+  virtual void RenderViewCreated() override;
   virtual void HandleKeyboardEvent(
       content::WebContents* source,
-      const content::NativeWebKeyboardEvent& event) OVERRIDE;
-  virtual void DidStopLoading() OVERRIDE;
+      const content::NativeWebKeyboardEvent& event) override;
+  virtual void DidStopLoading() override;
 
  private:
   content::RenderViewHost* render_view_host() const;
diff --git a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h
index 1df513b..af4b80b 100644
--- a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h
+++ b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h
@@ -42,17 +42,17 @@ class MediaGalleriesDialogCocoa : public ConstrainedWindowMacDelegate,
   void OnAuxiliaryButtonClicked();
 
   // MediaGalleriesDialog implementation:
-  virtual void UpdateGalleries() OVERRIDE;
+  virtual void UpdateGalleries() override;
 
   // ConstrainedWindowMacDelegate implementation.
   virtual void OnConstrainedWindowClosed(
-      ConstrainedWindowMac* window) OVERRIDE;
+      ConstrainedWindowMac* window) override;
 
   // MediaGalleryListEntryController implementation.
   virtual void OnCheckboxToggled(MediaGalleryPrefId pref_id,
-                                 bool checked) OVERRIDE;
-  virtual void OnFolderViewerClicked(MediaGalleryPrefId prefId) OVERRIDE;
-  virtual ui::MenuModel* GetContextMenu(MediaGalleryPrefId pref_id) OVERRIDE;
+                                 bool checked) override;
+  virtual void OnFolderViewerClicked(MediaGalleryPrefId prefId) override;
+  virtual ui::MenuModel* GetContextMenu(MediaGalleryPrefId pref_id) override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(MediaGalleriesDialogBrowserTest, Close);
@@ -62,7 +62,7 @@ class MediaGalleriesDialogCocoa : public ConstrainedWindowMacDelegate,
   FRIEND_TEST_ALL_PREFIXES(MediaGalleriesDialogTest, ForgetDeletes);
 
   // MediaGalleriesDialog implementation:
-  virtual void AcceptDialogForTesting() OVERRIDE;
+  virtual void AcceptDialogForTesting() override;
 
   void InitDialogControls();
   CGFloat CreateCheckboxes(
diff --git a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm
index d9bc3ca..396eba4 100644
--- a/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm
+++ b/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa_unittest.mm
@@ -52,7 +52,7 @@ class MediaGalleriesDialogTest : public testing::Test {
   MediaGalleriesDialogTest() {}
   virtual ~MediaGalleriesDialogTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     std::vector<base::string16> headers;
     headers.push_back(base::string16());
     headers.push_back(base::ASCIIToUTF16("header2"));
@@ -62,7 +62,7 @@ class MediaGalleriesDialogTest : public testing::Test {
         Times(AnyNumber());
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     Mock::VerifyAndClearExpectations(&controller_);
     dialog_.reset();
   }
diff --git a/chrome/browser/ui/cocoa/extensions/windowed_install_dialog_controller.h b/chrome/browser/ui/cocoa/extensions/windowed_install_dialog_controller.h
index 55dd58c..700a9d8 100644
--- a/chrome/browser/ui/cocoa/extensions/windowed_install_dialog_controller.h
+++ b/chrome/browser/ui/cocoa/extensions/windowed_install_dialog_controller.h
@@ -32,8 +32,8 @@ class WindowedInstallDialogController
   void OnWindowClosing();
 
   // ExtensionInstallPrompt::Delegate:
-  virtual void InstallUIProceed() OVERRIDE;
-  virtual void InstallUIAbort(bool user_initiated) OVERRIDE;
+  virtual void InstallUIProceed() override;
+  virtual void InstallUIAbort(bool user_initiated) override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(WindowedInstallDialogControllerBrowserTest,
diff --git a/chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h b/chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h
index 2ea64e9..45f7282 100644
--- a/chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h
+++ b/chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h
@@ -46,39 +46,39 @@ class FindBarBridge : public FindBar,
   }
 
   virtual void SetFindBarController(
-      FindBarController* find_bar_controller) OVERRIDE;
+      FindBarController* find_bar_controller) override;
 
-  virtual FindBarController* GetFindBarController() const OVERRIDE;
+  virtual FindBarController* GetFindBarController() const override;
 
-  virtual FindBarTesting* GetFindBarTesting() OVERRIDE;
+  virtual FindBarTesting* GetFindBarTesting() override;
 
   // Methods from FindBar.
-  virtual void Show(bool animate) OVERRIDE;
-  virtual void Hide(bool animate) OVERRIDE;
-  virtual void SetFocusAndSelection() OVERRIDE;
-  virtual void ClearResults(const FindNotificationDetails& results) OVERRIDE;
-  virtual void StopAnimation() OVERRIDE;
+  virtual void Show(bool animate) override;
+  virtual void Hide(bool animate) override;
+  virtual void SetFocusAndSelection() override;
+  virtual void ClearResults(const FindNotificationDetails& results) override;
+  virtual void StopAnimation() override;
   virtual void SetFindTextAndSelectedRange(
       const base::string16& find_text,
-      const gfx::Range& selected_range) OVERRIDE;
-  virtual base::string16 GetFindText() OVERRIDE;
-  virtual gfx::Range GetSelectedRange() OVERRIDE;
+      const gfx::Range& selected_range) override;
+  virtual base::string16 GetFindText() override;
+  virtual gfx::Range GetSelectedRange() override;
   virtual void UpdateUIForFindResult(const FindNotificationDetails& result,
-                                     const base::string16& find_text) OVERRIDE;
-  virtual void AudibleAlert() OVERRIDE;
-  virtual bool IsFindBarVisible() OVERRIDE;
-  virtual void RestoreSavedFocus() OVERRIDE;
-  virtual bool HasGlobalFindPasteboard() OVERRIDE;
-  virtual void UpdateFindBarForChangedWebContents() OVERRIDE;
+                                     const base::string16& find_text) override;
+  virtual void AudibleAlert() override;
+  virtual bool IsFindBarVisible() override;
+  virtual void RestoreSavedFocus() override;
+  virtual bool HasGlobalFindPasteboard() override;
+  virtual void UpdateFindBarForChangedWebContents() override;
   virtual void MoveWindowIfNecessary(const gfx::Rect& selection_rect,
-                                     bool no_redraw) OVERRIDE;
+                                     bool no_redraw) override;
 
   // Methods from FindBarTesting.
   virtual bool GetFindBarWindowInfo(gfx::Point* position,
-                                    bool* fully_visible) OVERRIDE;
-  virtual base::string16 GetFindSelectedText() OVERRIDE;
-  virtual base::string16 GetMatchCountText() OVERRIDE;
-  virtual int GetWidth() OVERRIDE;
+                                    bool* fully_visible) override;
+  virtual base::string16 GetFindSelectedText() override;
+  virtual base::string16 GetMatchCountText() override;
+  virtual int GetWidth() override;
 
   // Used to disable find bar animations when testing.
   static bool disable_animations_during_testing_;
diff --git a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm
index 0658d69..dbdf985 100644
--- a/chrome/browser/ui/cocoa/global_error_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/global_error_bubble_controller.mm
@@ -38,7 +38,7 @@ class Bridge : public GlobalErrorBubbleViewBase {
   }
 
  private:
-  virtual void CloseBubbleView() OVERRIDE {
+  virtual void CloseBubbleView() override {
     [controller_ close];
   }
 
diff --git a/chrome/browser/ui/cocoa/history_menu_bridge.h b/chrome/browser/ui/cocoa/history_menu_bridge.h
index aa6c3d3..088ac24 100644
--- a/chrome/browser/ui/cocoa/history_menu_bridge.h
+++ b/chrome/browser/ui/cocoa/history_menu_bridge.h
@@ -129,15 +129,15 @@ class HistoryMenuBridge : public content::NotificationObserver,
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // TabRestoreServiceObserver:
-  virtual void TabRestoreServiceChanged(TabRestoreService* service) OVERRIDE;
-  virtual void TabRestoreServiceDestroyed(TabRestoreService* service) OVERRIDE;
+  virtual void TabRestoreServiceChanged(TabRestoreService* service) override;
+  virtual void TabRestoreServiceDestroyed(TabRestoreService* service) override;
 
   // MainMenuItem:
-  virtual void ResetMenu() OVERRIDE;
-  virtual void BuildMenu() OVERRIDE;
+  virtual void ResetMenu() override;
+  virtual void BuildMenu() override;
 
   // Looks up an NSMenuItem in the |menu_item_map_| and returns the
   // corresponding HistoryItem.
diff --git a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm
index 3ea8075..51894fb 100644
--- a/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm
+++ b/chrome/browser/ui/cocoa/history_menu_bridge_unittest.mm
@@ -37,7 +37,7 @@ class MockBridge : public HistoryMenuBridge {
       : HistoryMenuBridge(profile),
         menu_([[NSMenu alloc] initWithTitle:@"History"]) {}
 
-  virtual NSMenu* HistoryMenu() OVERRIDE {
+  virtual NSMenu* HistoryMenu() override {
     return menu_.get();
   }
 
diff --git a/chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm b/chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm
index b49e64b..9f2ea75 100644
--- a/chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/history_menu_cocoa_controller_unittest.mm
@@ -37,7 +37,7 @@
 
 class HistoryMenuCocoaControllerTest : public CocoaProfileTest {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(profile());
 
diff --git a/chrome/browser/ui/cocoa/hung_renderer_controller.mm b/chrome/browser/ui/cocoa/hung_renderer_controller.mm
index 6a1a051..3cc2e6c 100644
--- a/chrome/browser/ui/cocoa/hung_renderer_controller.mm
+++ b/chrome/browser/ui/cocoa/hung_renderer_controller.mm
@@ -46,10 +46,10 @@ class HungRendererWebContentsObserverBridge
 
  protected:
   // WebContentsObserver overrides:
-  virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE {
+  virtual void RenderProcessGone(base::TerminationStatus status) override {
     [controller_ renderProcessGone];
   }
-  virtual void WebContentsDestroyed() OVERRIDE {
+  virtual void WebContentsDestroyed() override {
     [controller_ renderProcessGone];
   }
 
diff --git a/chrome/browser/ui/cocoa/info_bubble_window.mm b/chrome/browser/ui/cocoa/info_bubble_window.mm
index 77eaab5..c32e888 100644
--- a/chrome/browser/ui/cocoa/info_bubble_window.mm
+++ b/chrome/browser/ui/cocoa/info_bubble_window.mm
@@ -41,7 +41,7 @@ class AppNotificationBridge : public content::NotificationObserver {
   virtual void Observe(
       int type,
       const content::NotificationSource& source,
-      const content::NotificationDetails& details) OVERRIDE {
+      const content::NotificationDetails& details) override {
     switch (type) {
       case chrome::NOTIFICATION_APP_TERMINATING:
         [owner_ appIsTerminating];
diff --git a/chrome/browser/ui/cocoa/infobars/confirm_infobar_controller_unittest.mm b/chrome/browser/ui/cocoa/infobars/confirm_infobar_controller_unittest.mm
index 819c35c..6a8c6e3 100644
--- a/chrome/browser/ui/cocoa/infobars/confirm_infobar_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/infobars/confirm_infobar_controller_unittest.mm
@@ -85,7 +85,7 @@ namespace {
 class ConfirmInfoBarControllerTest : public CocoaProfileTest,
                                      public MockConfirmInfoBarDelegate::Owner {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaProfileTest::SetUp();
     web_contents_.reset(
         WebContents::Create(WebContents::CreateParams(profile())));
@@ -110,7 +110,7 @@ class ConfirmInfoBarControllerTest : public CocoaProfileTest,
     delegate_closed_ = false;
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     [controller_ removeSelf];
     CocoaProfileTest::TearDown();
   }
@@ -130,7 +130,7 @@ class ConfirmInfoBarControllerTest : public CocoaProfileTest,
   bool closed_delegate_link_clicked_;
 
  private:
-  virtual void OnInfoBarDelegateClosed() OVERRIDE {
+  virtual void OnInfoBarDelegateClosed() override {
     closed_delegate_ok_clicked_ = delegate()->ok_clicked();
     closed_delegate_cancel_clicked_ = delegate()->cancel_clicked();
     closed_delegate_link_clicked_ = delegate()->link_clicked();
diff --git a/chrome/browser/ui/cocoa/infobars/infobar_container_cocoa.h b/chrome/browser/ui/cocoa/infobars/infobar_container_cocoa.h
index 5d37f37..41e65c6 100644
--- a/chrome/browser/ui/cocoa/infobars/infobar_container_cocoa.h
+++ b/chrome/browser/ui/cocoa/infobars/infobar_container_cocoa.h
@@ -20,14 +20,14 @@ class InfoBarContainerCocoa : public infobars::InfoBarContainer,
  private:
   // InfoBarContainer:
   virtual void PlatformSpecificAddInfoBar(infobars::InfoBar* infobar,
-                                          size_t position) OVERRIDE;
+                                          size_t position) override;
   virtual void PlatformSpecificRemoveInfoBar(
-      infobars::InfoBar* infobar) OVERRIDE;
+      infobars::InfoBar* infobar) override;
 
   // InfoBarContainer::Delegate:
-  virtual SkColor GetInfoBarSeparatorColor() const OVERRIDE;
-  virtual void InfoBarContainerStateChanged(bool is_animating) OVERRIDE;
-  virtual bool DrawInfoBarArrows(int* x) const OVERRIDE;
+  virtual SkColor GetInfoBarSeparatorColor() const override;
+  virtual void InfoBarContainerStateChanged(bool is_animating) override;
+  virtual bool DrawInfoBarArrows(int* x) const override;
 
   InfoBarContainerController* controller_;  // weak, owns us.
 
diff --git a/chrome/browser/ui/cocoa/infobars/infobar_container_controller_unittest.mm b/chrome/browser/ui/cocoa/infobars/infobar_container_controller_unittest.mm
index 967ddbe..e96e8e8 100644
--- a/chrome/browser/ui/cocoa/infobars/infobar_container_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/infobars/infobar_container_controller_unittest.mm
@@ -21,7 +21,7 @@
 namespace {
 
 class InfoBarContainerControllerTest : public CocoaProfileTest {
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaProfileTest::SetUp();
     web_contents_.reset(content::WebContents::Create(
         content::WebContents::CreateParams(profile())));
@@ -35,7 +35,7 @@ class InfoBarContainerControllerTest : public CocoaProfileTest {
     [[test_window() contentView] addSubview:view];
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     [[controller_ view] removeFromSuperviewWithoutNeedingDisplay];
     controller_.reset();
     CocoaProfileTest::TearDown();
diff --git a/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h b/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h
index 92dac00..ff9288e 100644
--- a/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h
+++ b/chrome/browser/ui/cocoa/infobars/mock_confirm_infobar_delegate.h
@@ -36,13 +36,13 @@ class MockConfirmInfoBarDelegate : public ConfirmInfoBarDelegate {
 
  private:
   // ConfirmInfoBarDelegate:
-  virtual int GetIconID() const OVERRIDE;
-  virtual base::string16 GetMessageText() const OVERRIDE;
-  virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
-  virtual bool Accept() OVERRIDE;
-  virtual bool Cancel() OVERRIDE;
-  virtual base::string16 GetLinkText() const OVERRIDE;
-  virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
+  virtual int GetIconID() const override;
+  virtual base::string16 GetMessageText() const override;
+  virtual base::string16 GetButtonLabel(InfoBarButton button) const override;
+  virtual bool Accept() override;
+  virtual bool Cancel() override;
+  virtual base::string16 GetLinkText() const override;
+  virtual bool LinkClicked(WindowOpenDisposition disposition) override;
 
   Owner* owner_;
   // Determines whether the infobar closes when an action is taken or not.
diff --git a/chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm b/chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm
index ee404c8..10690f9 100644
--- a/chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm
+++ b/chrome/browser/ui/cocoa/infobars/translate_infobar_unittest.mm
@@ -57,11 +57,11 @@ class MockTranslateInfoBarDelegate
 
   MOCK_METHOD0(TranslationDeclined, void());
 
-  virtual bool IsTranslatableLanguageByPrefs() OVERRIDE { return true; }
+  virtual bool IsTranslatableLanguageByPrefs() override { return true; }
   MOCK_METHOD0(ToggleTranslatableLanguageByPrefs, void());
-  virtual bool IsSiteBlacklisted() OVERRIDE { return false; }
+  virtual bool IsSiteBlacklisted() override { return false; }
   MOCK_METHOD0(ToggleSiteBlacklist, void());
-  virtual bool ShouldAlwaysTranslate() OVERRIDE { return false; }
+  virtual bool ShouldAlwaysTranslate() override { return false; }
   MOCK_METHOD0(ToggleAlwaysTranslate, void());
 };
 
@@ -74,7 +74,7 @@ class TranslationInfoBarTest : public CocoaProfileTest {
 
   // Each test gets a single Mock translate delegate for the lifetime of
   // the test.
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     translate::TranslateLanguageList::DisableUpdate();
     CocoaProfileTest::SetUp();
     web_contents_.reset(
@@ -83,7 +83,7 @@ class TranslationInfoBarTest : public CocoaProfileTest {
     ChromeTranslateClient::CreateForWebContents(web_contents_.get());
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     if (infobar_) {
       infobar_->CloseSoon();
       infobar_ = NULL;
diff --git a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h
index a4845d3..42e2a62 100644
--- a/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h
+++ b/chrome/browser/ui/cocoa/javascript_app_modal_dialog_cocoa.h
@@ -25,12 +25,12 @@ class JavaScriptAppModalDialogCocoa : public NativeAppModalDialog {
   virtual ~JavaScriptAppModalDialogCocoa();
 
   // Overridden from NativeAppModalDialog:
-  virtual int GetAppModalDialogButtons() const OVERRIDE;
-  virtual void ShowAppModalDialog() OVERRIDE;
-  virtual void ActivateAppModalDialog() OVERRIDE;
-  virtual void CloseAppModalDialog() OVERRIDE;
-  virtual void AcceptAppModalDialog() OVERRIDE;
-  virtual void CancelAppModalDialog() OVERRIDE;
+  virtual int GetAppModalDialogButtons() const override;
+  virtual void ShowAppModalDialog() override;
+  virtual void ActivateAppModalDialog() override;
+  virtual void CloseAppModalDialog() override;
+  virtual void AcceptAppModalDialog() override;
+  virtual void CancelAppModalDialog() override;
 
   JavaScriptAppModalDialog* dialog() const { return dialog_.get(); }
 
diff --git a/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm b/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm
index 4c85eda..9646483 100644
--- a/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm
+++ b/chrome/browser/ui/cocoa/keystone_infobar_delegate.mm
@@ -51,13 +51,13 @@ class KeystonePromotionInfoBarDelegate : public ConfirmInfoBarDelegate {
   void SetCanExpire() { can_expire_ = true; }
 
   // ConfirmInfoBarDelegate
-  virtual int GetIconID() const OVERRIDE;
-  virtual base::string16 GetMessageText() const OVERRIDE;
-  virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
-  virtual bool Accept() OVERRIDE;
-  virtual bool Cancel() OVERRIDE;
+  virtual int GetIconID() const override;
+  virtual base::string16 GetMessageText() const override;
+  virtual base::string16 GetButtonLabel(InfoBarButton button) const override;
+  virtual bool Accept() override;
+  virtual bool Cancel() override;
   virtual bool ShouldExpireInternal(
-      const NavigationDetails& details) const OVERRIDE;
+      const NavigationDetails& details) const override;
 
   // The prefs to use.
   PrefService* prefs_;  // weak
diff --git a/chrome/browser/ui/cocoa/location_bar/bubble_decoration.h b/chrome/browser/ui/cocoa/location_bar/bubble_decoration.h
index 21aaac1..4a290c5 100644
--- a/chrome/browser/ui/cocoa/location_bar/bubble_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/bubble_decoration.h
@@ -28,11 +28,11 @@ class BubbleDecoration : public LocationBarDecoration {
   virtual ui::NinePartImageIds GetBubbleImageIds() = 0;
 
   // Implement |LocationBarDecoration|.
-  virtual void DrawInFrame(NSRect frame, NSView* control_view) OVERRIDE;
+  virtual void DrawInFrame(NSRect frame, NSView* control_view) override;
   virtual void DrawWithBackgroundInFrame(NSRect background_frame,
                                          NSRect frame,
-                                         NSView* control_view) OVERRIDE;
-  virtual CGFloat GetWidthForSpace(CGFloat width) OVERRIDE;
+                                         NSView* control_view) override;
+  virtual CGFloat GetWidthForSpace(CGFloat width) override;
 
  protected:
   // Helper returning bubble width for the given |image| and |label|
diff --git a/chrome/browser/ui/cocoa/location_bar/button_decoration.h b/chrome/browser/ui/cocoa/location_bar/button_decoration.h
index 3306721..d0f5f29 100644
--- a/chrome/browser/ui/cocoa/location_bar/button_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/button_decoration.h
@@ -57,12 +57,12 @@ class ButtonDecoration : public LocationBarDecoration {
   NSImage* GetIconImage() const;
 
   // Implement |LocationBarDecoration|.
-  virtual CGFloat GetWidthForSpace(CGFloat width) OVERRIDE;
-  virtual void DrawInFrame(NSRect frame, NSView* control_view) OVERRIDE;
-  virtual bool AcceptsMousePress() OVERRIDE;
-  virtual bool IsDraggable() OVERRIDE;
-  virtual bool OnMousePressed(NSRect frame, NSPoint location) OVERRIDE;
-  virtual ButtonDecoration* AsButtonDecoration() OVERRIDE;
+  virtual CGFloat GetWidthForSpace(CGFloat width) override;
+  virtual void DrawInFrame(NSRect frame, NSView* control_view) override;
+  virtual bool AcceptsMousePress() override;
+  virtual bool IsDraggable() override;
+  virtual bool OnMousePressed(NSRect frame, NSPoint location) override;
+  virtual ButtonDecoration* AsButtonDecoration() override;
 
  private:
   ui::NinePartImageIds normal_image_ids_;
diff --git a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h
index 9873e31..5358d6a 100644
--- a/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h
@@ -33,12 +33,12 @@ class ContentSettingDecoration : public ImageDecoration {
   bool UpdateFromWebContents(content::WebContents* web_contents);
 
   // Overridden from |LocationBarDecoration|
-  virtual bool AcceptsMousePress() OVERRIDE;
-  virtual bool OnMousePressed(NSRect frame, NSPoint location) OVERRIDE;
-  virtual NSString* GetToolTip() OVERRIDE;
-  virtual CGFloat GetWidthForSpace(CGFloat width) OVERRIDE;
-  virtual void DrawInFrame(NSRect frame, NSView* control_view) OVERRIDE;
-  virtual NSPoint GetBubblePointInFrame(NSRect frame) OVERRIDE;
+  virtual bool AcceptsMousePress() override;
+  virtual bool OnMousePressed(NSRect frame, NSPoint location) override;
+  virtual NSString* GetToolTip() override;
+  virtual CGFloat GetWidthForSpace(CGFloat width) override;
+  virtual void DrawInFrame(NSRect frame, NSView* control_view) override;
+  virtual NSPoint GetBubblePointInFrame(NSRect frame) override;
 
   // Called from internal animator. Only public because ObjC objects can't
   // be friends.
diff --git a/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.h b/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.h
index af3fc8e..b63bf99 100644
--- a/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/ev_bubble_decoration.h
@@ -31,17 +31,17 @@ class EVBubbleDecoration : public BubbleDecoration {
 
 
   // Implement |LocationBarDecoration|.
-  virtual CGFloat GetWidthForSpace(CGFloat width) OVERRIDE;
-  virtual bool IsDraggable() OVERRIDE;
-  virtual NSPasteboard* GetDragPasteboard() OVERRIDE;
-  virtual NSImage* GetDragImage() OVERRIDE;
-  virtual NSRect GetDragImageFrame(NSRect frame) OVERRIDE;
-  virtual bool OnMousePressed(NSRect frame, NSPoint location) OVERRIDE;
-  virtual bool AcceptsMousePress() OVERRIDE;
-  virtual NSPoint GetBubblePointInFrame(NSRect frame) OVERRIDE;
+  virtual CGFloat GetWidthForSpace(CGFloat width) override;
+  virtual bool IsDraggable() override;
+  virtual NSPasteboard* GetDragPasteboard() override;
+  virtual NSImage* GetDragImage() override;
+  virtual NSRect GetDragImageFrame(NSRect frame) override;
+  virtual bool OnMousePressed(NSRect frame, NSPoint location) override;
+  virtual bool AcceptsMousePress() override;
+  virtual NSPoint GetBubblePointInFrame(NSRect frame) override;
 
   // Implement |BubbleDecoration|.
-  virtual ui::NinePartImageIds GetBubbleImageIds() OVERRIDE;
+  virtual ui::NinePartImageIds GetBubbleImageIds() override;
 
  private:
   // The real label.  BubbleDecoration's label may be elided.
diff --git a/chrome/browser/ui/cocoa/location_bar/generated_credit_card_decoration.h b/chrome/browser/ui/cocoa/location_bar/generated_credit_card_decoration.h
index 74fd5ce..e50ae99 100644
--- a/chrome/browser/ui/cocoa/location_bar/generated_credit_card_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/generated_credit_card_decoration.h
@@ -30,9 +30,9 @@ class GeneratedCreditCardDecoration : public ImageDecoration {
   // Implement |LocationBarDecoration|.
   // N.B. - this is identical to LocationBarDecorationView's OnClick
   // and canHandleClick.
-  virtual bool AcceptsMousePress() OVERRIDE;
-  virtual bool OnMousePressed(NSRect frame, NSPoint location) OVERRIDE;
-  virtual NSPoint GetBubblePointInFrame(NSRect frame) OVERRIDE;
+  virtual bool AcceptsMousePress() override;
+  virtual bool OnMousePressed(NSRect frame, NSPoint location) override;
+  virtual NSPoint GetBubblePointInFrame(NSRect frame) override;
 
  private:
   // Helper to get the GeneratedCreditCardBubbleController associated with the
diff --git a/chrome/browser/ui/cocoa/location_bar/image_decoration.h b/chrome/browser/ui/cocoa/location_bar/image_decoration.h
index 0bb4193..d2730ca 100644
--- a/chrome/browser/ui/cocoa/location_bar/image_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/image_decoration.h
@@ -23,8 +23,8 @@ class ImageDecoration : public LocationBarDecoration {
   NSRect GetDrawRectInFrame(NSRect frame);
 
   // Implement |LocationBarDecoration|.
-  virtual CGFloat GetWidthForSpace(CGFloat width) OVERRIDE;
-  virtual void DrawInFrame(NSRect frame, NSView* control_view) OVERRIDE;
+  virtual CGFloat GetWidthForSpace(CGFloat width) override;
+  virtual void DrawInFrame(NSRect frame, NSView* control_view) override;
 
  private:
   base::scoped_nsobject<NSImage> image_;
diff --git a/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h b/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h
index 0342bc3..648dc07 100644
--- a/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/keyword_hint_decoration.h
@@ -24,8 +24,8 @@ class KeywordHintDecoration : public LocationBarDecoration {
   void SetKeyword(const base::string16& keyword, bool is_extension_keyword);
 
   // Implement |LocationBarDecoration|.
-  virtual void DrawInFrame(NSRect frame, NSView* control_view) OVERRIDE;
-  virtual CGFloat GetWidthForSpace(CGFloat width) OVERRIDE;
+  virtual void DrawInFrame(NSRect frame, NSView* control_view) override;
+  virtual CGFloat GetWidthForSpace(CGFloat width) override;
 
  private:
   // Fetch and cache the [tab] image.
diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
index 87a7347..202ba95 100644
--- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h
@@ -56,35 +56,35 @@ class LocationBarViewMac : public LocationBar,
   virtual ~LocationBarViewMac();
 
   // Overridden from LocationBar:
-  virtual void ShowFirstRunBubble() OVERRIDE;
-  virtual GURL GetDestinationURL() const OVERRIDE;
-  virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE;
-  virtual ui::PageTransition GetPageTransition() const OVERRIDE;
-  virtual void AcceptInput() OVERRIDE;
-  virtual void FocusLocation(bool select_all) OVERRIDE;
-  virtual void FocusSearch() OVERRIDE;
-  virtual void UpdateContentSettingsIcons() OVERRIDE;
-  virtual void UpdateManagePasswordsIconAndBubble() OVERRIDE;
-  virtual void UpdatePageActions() OVERRIDE;
-  virtual void InvalidatePageActions() OVERRIDE;
-  virtual void UpdateBookmarkStarVisibility() OVERRIDE;
+  virtual void ShowFirstRunBubble() override;
+  virtual GURL GetDestinationURL() const override;
+  virtual WindowOpenDisposition GetWindowOpenDisposition() const override;
+  virtual ui::PageTransition GetPageTransition() const override;
+  virtual void AcceptInput() override;
+  virtual void FocusLocation(bool select_all) override;
+  virtual void FocusSearch() override;
+  virtual void UpdateContentSettingsIcons() override;
+  virtual void UpdateManagePasswordsIconAndBubble() override;
+  virtual void UpdatePageActions() override;
+  virtual void InvalidatePageActions() override;
+  virtual void UpdateBookmarkStarVisibility() override;
   virtual bool ShowPageActionPopup(const extensions::Extension* extension,
-                                   bool grant_active_tab) OVERRIDE;
-  virtual void UpdateOpenPDFInReaderPrompt() OVERRIDE;
-  virtual void UpdateGeneratedCreditCardView() OVERRIDE;
-  virtual void SaveStateToContents(content::WebContents* contents) OVERRIDE;
-  virtual void Revert() OVERRIDE;
-  virtual const OmniboxView* GetOmniboxView() const OVERRIDE;
-  virtual OmniboxView* GetOmniboxView() OVERRIDE;
-  virtual LocationBarTesting* GetLocationBarForTesting() OVERRIDE;
+                                   bool grant_active_tab) override;
+  virtual void UpdateOpenPDFInReaderPrompt() override;
+  virtual void UpdateGeneratedCreditCardView() override;
+  virtual void SaveStateToContents(content::WebContents* contents) override;
+  virtual void Revert() override;
+  virtual const OmniboxView* GetOmniboxView() const override;
+  virtual OmniboxView* GetOmniboxView() override;
+  virtual LocationBarTesting* GetLocationBarForTesting() override;
 
   // Overridden from LocationBarTesting:
-  virtual int PageActionCount() OVERRIDE;
-  virtual int PageActionVisibleCount() OVERRIDE;
-  virtual ExtensionAction* GetPageAction(size_t index) OVERRIDE;
-  virtual ExtensionAction* GetVisiblePageAction(size_t index) OVERRIDE;
-  virtual void TestPageActionPressed(size_t index) OVERRIDE;
-  virtual bool GetBookmarkStarVisibility() OVERRIDE;
+  virtual int PageActionCount() override;
+  virtual int PageActionVisibleCount() override;
+  virtual ExtensionAction* GetPageAction(size_t index) override;
+  virtual ExtensionAction* GetVisiblePageAction(size_t index) override;
+  virtual void TestPageActionPressed(size_t index) override;
+  virtual bool GetBookmarkStarVisibility() override;
 
   // Set/Get the editable state of the field.
   void SetEditable(bool editable);
@@ -154,15 +154,15 @@ class LocationBarViewMac : public LocationBar,
   NSPoint GetPageActionBubblePoint(ExtensionAction* page_action);
 
   // OmniboxEditController:
-  virtual void Update(const content::WebContents* contents) OVERRIDE;
-  virtual void OnChanged() OVERRIDE;
-  virtual void OnSetFocus() OVERRIDE;
-  virtual void ShowURL() OVERRIDE;
-  virtual void EndOriginChipAnimations(bool cancel_fade) OVERRIDE;
-  virtual InstantController* GetInstant() OVERRIDE;
-  virtual content::WebContents* GetWebContents() OVERRIDE;
-  virtual ToolbarModel* GetToolbarModel() OVERRIDE;
-  virtual const ToolbarModel* GetToolbarModel() const OVERRIDE;
+  virtual void Update(const content::WebContents* contents) override;
+  virtual void OnChanged() override;
+  virtual void OnSetFocus() override;
+  virtual void ShowURL() override;
+  virtual void EndOriginChipAnimations(bool cancel_fade) override;
+  virtual InstantController* GetInstant() override;
+  virtual content::WebContents* GetWebContents() override;
+  virtual ToolbarModel* GetToolbarModel() override;
+  virtual const ToolbarModel* GetToolbarModel() const override;
 
   NSImage* GetKeywordImage(const base::string16& keyword);
 
@@ -174,13 +174,13 @@ class LocationBarViewMac : public LocationBar,
 
   // SearchModelObserver:
   virtual void ModelChanged(const SearchModel::State& old_state,
-                            const SearchModel::State& new_state) OVERRIDE;
+                            const SearchModel::State& new_state) override;
 
   Browser* browser() const { return browser_; }
 
  protected:
   // OmniboxEditController:
-  virtual void HideURL() OVERRIDE;
+  virtual void HideURL() override;
 
  private:
   friend ZoomDecorationTest;
diff --git a/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h b/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h
index 615affab..64c6d3d 100644
--- a/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/location_icon_decoration.h
@@ -20,16 +20,16 @@ class LocationIconDecoration : public ImageDecoration {
   virtual ~LocationIconDecoration();
 
   // Allow dragging the current URL.
-  virtual bool IsDraggable() OVERRIDE;
-  virtual NSPasteboard* GetDragPasteboard() OVERRIDE;
-  virtual NSImage* GetDragImage() OVERRIDE;
-  virtual NSRect GetDragImageFrame(NSRect frame) OVERRIDE;
+  virtual bool IsDraggable() override;
+  virtual NSPasteboard* GetDragPasteboard() override;
+  virtual NSImage* GetDragImage() override;
+  virtual NSRect GetDragImageFrame(NSRect frame) override;
 
   // Show the page info panel on click.
-  virtual bool OnMousePressed(NSRect frame, NSPoint location) OVERRIDE;
-  virtual bool AcceptsMousePress() OVERRIDE;
-  virtual NSString* GetToolTip() OVERRIDE;
-  virtual NSPoint GetBubblePointInFrame(NSRect frame) OVERRIDE;
+  virtual bool OnMousePressed(NSRect frame, NSPoint location) override;
+  virtual bool AcceptsMousePress() override;
+  virtual NSString* GetToolTip() override;
+  virtual NSPoint GetBubblePointInFrame(NSRect frame) override;
 
  private:
   NSRect drag_frame_;
diff --git a/chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration.h b/chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration.h
index 3534816..981cd7b 100644
--- a/chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration.h
@@ -22,7 +22,7 @@ class ManagePasswordsIconCocoa : public ManagePasswordsIcon {
  public:
   ManagePasswordsIconCocoa(ManagePasswordsDecoration* decoration);
   virtual ~ManagePasswordsIconCocoa();
-  virtual void UpdateVisibleUI() OVERRIDE;
+  virtual void UpdateVisibleUI() override;
 
   int icon_id() { return icon_id_; }
   int tooltip_text_id() { return tooltip_text_id_; }
@@ -40,10 +40,10 @@ class ManagePasswordsDecoration : public ImageDecoration {
   virtual ~ManagePasswordsDecoration();
 
   // Implement |LocationBarDecoration|
-  virtual bool AcceptsMousePress() OVERRIDE;
-  virtual bool OnMousePressed(NSRect frame, NSPoint location) OVERRIDE;
-  virtual NSString* GetToolTip() OVERRIDE;
-  virtual NSPoint GetBubblePointInFrame(NSRect frame) OVERRIDE;
+  virtual bool AcceptsMousePress() override;
+  virtual bool OnMousePressed(NSRect frame, NSPoint location) override;
+  virtual NSString* GetToolTip() override;
+  virtual NSPoint GetBubblePointInFrame(NSRect frame) override;
 
   // Updates the decoration according to icon state changes.
   void UpdateVisibleUI();
diff --git a/chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration_unittest.mm b/chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration_unittest.mm
index 37a0936..56c543c 100644
--- a/chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration_unittest.mm
+++ b/chrome/browser/ui/cocoa/location_bar/manage_passwords_decoration_unittest.mm
@@ -29,7 +29,7 @@ class TestCommandUpdaterDelegate : public CommandUpdaterDelegate {
 
   virtual void ExecuteCommandWithDisposition(
       int id,
-      WindowOpenDisposition disposition) OVERRIDE {
+      WindowOpenDisposition disposition) override {
     id_ = id;
   }
 
diff --git a/chrome/browser/ui/cocoa/location_bar/mic_search_decoration.h b/chrome/browser/ui/cocoa/location_bar/mic_search_decoration.h
index d8e2bb0..66d9a0c 100644
--- a/chrome/browser/ui/cocoa/location_bar/mic_search_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/mic_search_decoration.h
@@ -19,9 +19,9 @@ class MicSearchDecoration : public ImageDecoration {
   virtual ~MicSearchDecoration();
 
   // Implement |LocationBarDecoration|.
-  virtual bool AcceptsMousePress() OVERRIDE;
-  virtual bool OnMousePressed(NSRect frame, NSPoint location) OVERRIDE;
-  virtual NSString* GetToolTip() OVERRIDE;
+  virtual bool AcceptsMousePress() override;
+  virtual bool OnMousePressed(NSRect frame, NSPoint location) override;
+  virtual NSString* GetToolTip() override;
 
  private:
   CommandUpdater* command_updater_;  // Weak, owned by Browser.
diff --git a/chrome/browser/ui/cocoa/location_bar/origin_chip_decoration.h b/chrome/browser/ui/cocoa/location_bar/origin_chip_decoration.h
index 57d93cb..282ffbc 100644
--- a/chrome/browser/ui/cocoa/location_bar/origin_chip_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/origin_chip_decoration.h
@@ -35,24 +35,24 @@ class OriginChipDecoration : public ButtonDecoration,
   void Update();
 
   // Implement |ButtonDecoration|.
-  virtual bool PreventFocus(NSPoint location) const OVERRIDE;
+  virtual bool PreventFocus(NSPoint location) const override;
 
   // Implement |LocationBarDecoration|.
-  virtual CGFloat GetWidthForSpace(CGFloat width) OVERRIDE;
-  virtual void DrawInFrame(NSRect frame, NSView* control_view) OVERRIDE;
-  virtual NSString* GetToolTip() OVERRIDE;
-  virtual bool OnMousePressed(NSRect frame, NSPoint location) OVERRIDE;
-  virtual NSPoint GetBubblePointInFrame(NSRect frame) OVERRIDE;
+  virtual CGFloat GetWidthForSpace(CGFloat width) override;
+  virtual void DrawInFrame(NSRect frame, NSView* control_view) override;
+  virtual NSString* GetToolTip() override;
+  virtual bool OnMousePressed(NSRect frame, NSPoint location) override;
+  virtual NSPoint GetBubblePointInFrame(NSRect frame) override;
 
   // Implement |IconImage::Observer|.
   virtual void OnExtensionIconImageChanged(
-      extensions::IconImage* image) OVERRIDE;
+      extensions::IconImage* image) override;
 
   // Implement |SafeBrowsingUIManager::Observer|.
   virtual void OnSafeBrowsingHit(
-      const SafeBrowsingUIManager::UnsafeResource& resource) OVERRIDE;
+      const SafeBrowsingUIManager::UnsafeResource& resource) override;
   virtual void OnSafeBrowsingMatch(
-      const SafeBrowsingUIManager::UnsafeResource& resource) OVERRIDE;
+      const SafeBrowsingUIManager::UnsafeResource& resource) override;
 
  private:
   // Returns the width required to display the chip's contents.
diff --git a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h
index e5d860f..f13978c 100644
--- a/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/page_action_decoration.h
@@ -42,7 +42,7 @@ class PageActionDecoration : public ImageDecoration,
   bool preview_enabled() const { return preview_enabled_; }
 
   // Overridden from |ExtensionActionIconFactory::Observer|.
-  virtual void OnIconUpdated() OVERRIDE;
+  virtual void OnIconUpdated() override;
 
   // Called to notify the Page Action that it should determine whether
   // to be visible or hidden. |contents| is the WebContents that is
@@ -54,12 +54,12 @@ class PageActionDecoration : public ImageDecoration,
   void SetToolTip(std::string tooltip);
 
   // Overridden from |LocationBarDecoration|
-  virtual CGFloat GetWidthForSpace(CGFloat width) OVERRIDE;
-  virtual bool AcceptsMousePress() OVERRIDE;
-  virtual bool OnMousePressed(NSRect frame, NSPoint location) OVERRIDE;
-  virtual NSString* GetToolTip() OVERRIDE;
-  virtual NSMenu* GetMenu() OVERRIDE;
-  virtual NSPoint GetBubblePointInFrame(NSRect frame) OVERRIDE;
+  virtual CGFloat GetWidthForSpace(CGFloat width) override;
+  virtual bool AcceptsMousePress() override;
+  virtual bool OnMousePressed(NSRect frame, NSPoint location) override;
+  virtual NSString* GetToolTip() override;
+  virtual NSMenu* GetMenu() override;
+  virtual NSPoint GetBubblePointInFrame(NSRect frame) override;
 
   // Activates the page action in its default frame, and, if |grant_active_tab|
   // is true, grants active tab permission to the extension. Returns true if
@@ -79,7 +79,7 @@ class PageActionDecoration : public ImageDecoration,
   // Overridden from NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // The location bar view that owns us.
   LocationBarViewMac* owner_;
diff --git a/chrome/browser/ui/cocoa/location_bar/search_button_decoration.h b/chrome/browser/ui/cocoa/location_bar/search_button_decoration.h
index 428667e..1507566 100644
--- a/chrome/browser/ui/cocoa/location_bar/search_button_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/search_button_decoration.h
@@ -19,9 +19,9 @@ class SearchButtonDecoration : public ButtonDecoration {
   virtual ~SearchButtonDecoration();
 
   // Implement |LocationBarDecoration|.
-  virtual CGFloat GetWidthForSpace(CGFloat width) OVERRIDE;
-  virtual void DrawInFrame(NSRect frame, NSView* control_view) OVERRIDE;
-  virtual bool OnMousePressed(NSRect frame, NSPoint location) OVERRIDE;
+  virtual CGFloat GetWidthForSpace(CGFloat width) override;
+  virtual void DrawInFrame(NSRect frame, NSView* control_view) override;
+  virtual bool OnMousePressed(NSRect frame, NSPoint location) override;
 
  private:
   // The control view that owns this. Weak.
diff --git a/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h b/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h
index 9c6abf1..1e9c9bc7 100644
--- a/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/selected_keyword_decoration.h
@@ -24,10 +24,10 @@ class SelectedKeywordDecoration : public BubbleDecoration {
   // Determines what combination of labels and image will best fit
   // within |width|, makes those current for |BubbleDecoration|, and
   // return the resulting width.
-  virtual CGFloat GetWidthForSpace(CGFloat width) OVERRIDE;
+  virtual CGFloat GetWidthForSpace(CGFloat width) override;
 
   // Implements |BubbleDecoration|.
-  virtual ui::NinePartImageIds GetBubbleImageIds() OVERRIDE;
+  virtual ui::NinePartImageIds GetBubbleImageIds() override;
 
   void SetImage(NSImage* image);
 
diff --git a/chrome/browser/ui/cocoa/location_bar/star_decoration.h b/chrome/browser/ui/cocoa/location_bar/star_decoration.h
index 51ace2b..ef9f8d6 100644
--- a/chrome/browser/ui/cocoa/location_bar/star_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/star_decoration.h
@@ -25,10 +25,10 @@ class StarDecoration : public ImageDecoration {
   bool starred() const { return starred_; }
 
   // Implement |LocationBarDecoration|.
-  virtual bool AcceptsMousePress() OVERRIDE;
-  virtual bool OnMousePressed(NSRect frame, NSPoint location) OVERRIDE;
-  virtual NSString* GetToolTip() OVERRIDE;
-  virtual NSPoint GetBubblePointInFrame(NSRect frame) OVERRIDE;
+  virtual bool AcceptsMousePress() override;
+  virtual bool OnMousePressed(NSRect frame, NSPoint location) override;
+  virtual NSString* GetToolTip() override;
+  virtual NSPoint GetBubblePointInFrame(NSRect frame) override;
 
  private:
   // For bringing up bookmark bar.
diff --git a/chrome/browser/ui/cocoa/location_bar/translate_decoration.h b/chrome/browser/ui/cocoa/location_bar/translate_decoration.h
index 19756e9..0b518bb 100644
--- a/chrome/browser/ui/cocoa/location_bar/translate_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/translate_decoration.h
@@ -24,10 +24,10 @@ class TranslateDecoration : public ImageDecoration {
   void SetLit(bool on);
 
   // Implement |LocationBarDecoration|
-  virtual bool AcceptsMousePress() OVERRIDE;
-  virtual bool OnMousePressed(NSRect frame, NSPoint location) OVERRIDE;
-  virtual NSString* GetToolTip() OVERRIDE;
-  virtual NSPoint GetBubblePointInFrame(NSRect frame) OVERRIDE;
+  virtual bool AcceptsMousePress() override;
+  virtual bool OnMousePressed(NSRect frame, NSPoint location) override;
+  virtual NSString* GetToolTip() override;
+  virtual NSPoint GetBubblePointInFrame(NSRect frame) override;
 
  private:
   // For showing the translate bubble up.
diff --git a/chrome/browser/ui/cocoa/location_bar/zoom_decoration.h b/chrome/browser/ui/cocoa/location_bar/zoom_decoration.h
index bf060c1..7faa47e 100644
--- a/chrome/browser/ui/cocoa/location_bar/zoom_decoration.h
+++ b/chrome/browser/ui/cocoa/location_bar/zoom_decoration.h
@@ -54,14 +54,14 @@ class ZoomDecoration : public ImageDecoration,
   virtual bool ShouldShowDecoration() const;
 
   // LocationBarDecoration implementation.
-  virtual bool AcceptsMousePress() OVERRIDE;
-  virtual bool OnMousePressed(NSRect frame, NSPoint location) OVERRIDE;
-  virtual NSString* GetToolTip() OVERRIDE;
-  virtual NSPoint GetBubblePointInFrame(NSRect frame) OVERRIDE;
+  virtual bool AcceptsMousePress() override;
+  virtual bool OnMousePressed(NSRect frame, NSPoint location) override;
+  virtual NSString* GetToolTip() override;
+  virtual NSPoint GetBubblePointInFrame(NSRect frame) override;
 
   // ZoomBubbleControllerDelegate implementation.
-  virtual content::WebContents* GetWebContents() OVERRIDE;
-  virtual void OnClose() OVERRIDE;
+  virtual content::WebContents* GetWebContents() override;
+  virtual void OnClose() override;
 
   // The control that owns this. Weak.
   LocationBarViewMac* owner_;
diff --git a/chrome/browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm b/chrome/browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm
index 89e0563..b817905 100644
--- a/chrome/browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm
+++ b/chrome/browser/ui/cocoa/location_bar/zoom_decoration_browsertest.mm
@@ -24,14 +24,14 @@ class ZoomDecorationTest : public InProcessBrowserTest {
         should_quit_on_zoom_(false) {
   }
 
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     zoom_subscription_ = content::HostZoomMap::GetDefaultForBrowserContext(
         browser()->profile())->AddZoomLevelChangedCallback(
             base::Bind(&ZoomDecorationTest::OnZoomChanged,
                        base::Unretained(this)));
   }
 
-  virtual void TearDownOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() override {
     zoom_subscription_.reset();
   }
 
diff --git a/chrome/browser/ui/cocoa/location_bar/zoom_decoration_unittest.mm b/chrome/browser/ui/cocoa/location_bar/zoom_decoration_unittest.mm
index 8e2e2bc..9418bcc 100644
--- a/chrome/browser/ui/cocoa/location_bar/zoom_decoration_unittest.mm
+++ b/chrome/browser/ui/cocoa/location_bar/zoom_decoration_unittest.mm
@@ -14,9 +14,9 @@ class MockZoomDecoration : public ZoomDecoration {
  public:
   explicit MockZoomDecoration(LocationBarViewMac* owner)
       : ZoomDecoration(owner), update_ui_count_(0) {}
-  virtual bool ShouldShowDecoration() const OVERRIDE { return true; }
+  virtual bool ShouldShowDecoration() const override { return true; }
   virtual void ShowAndUpdateUI(ZoomController* zoom_controller,
-                               NSString* tooltip_string) OVERRIDE {
+                               NSString* tooltip_string) override {
     ++update_ui_count_;
     ZoomDecoration::ShowAndUpdateUI(zoom_controller, tooltip_string);
   }
@@ -31,7 +31,7 @@ class MockZoomController : public ZoomController {
  public:
   explicit MockZoomController(content::WebContents* web_contents)
       : ZoomController(web_contents) {}
-  virtual int GetZoomPercent() const OVERRIDE { return zoom_percent_; }
+  virtual int GetZoomPercent() const override { return zoom_percent_; }
 
   int zoom_percent_;
 
diff --git a/chrome/browser/ui/cocoa/login_prompt_cocoa.mm b/chrome/browser/ui/cocoa/login_prompt_cocoa.mm
index 6e1b27c..9986a1e 100644
--- a/chrome/browser/ui/cocoa/login_prompt_cocoa.mm
+++ b/chrome/browser/ui/cocoa/login_prompt_cocoa.mm
@@ -43,18 +43,18 @@ class LoginHandlerMac : public LoginHandler,
   // LoginModelObserver implementation.
   virtual void OnAutofillDataAvailable(
       const base::string16& username,
-      const base::string16& password) OVERRIDE {
+      const base::string16& password) override {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
     [sheet_controller_ autofillLogin:base::SysUTF16ToNSString(username)
                             password:base::SysUTF16ToNSString(password)];
   }
-  virtual void OnLoginModelDestroying() OVERRIDE {}
+  virtual void OnLoginModelDestroying() override {}
 
   // LoginHandler:
   virtual void BuildViewForPasswordManager(
       password_manager::PasswordManager* manager,
-      const base::string16& explanation) OVERRIDE {
+      const base::string16& explanation) override {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
     sheet_controller_.reset(
@@ -81,7 +81,7 @@ class LoginHandlerMac : public LoginHandler,
     NotifyAuthNeeded();
   }
 
-  virtual void CloseDialog() OVERRIDE {
+  virtual void CloseDialog() override {
     // The hosting dialog may have been freed.
     if (constrained_window_)
       constrained_window_->CloseWebContentsModalDialog();
@@ -89,7 +89,7 @@ class LoginHandlerMac : public LoginHandler,
 
   // Overridden from ConstrainedWindowMacDelegate:
   virtual void OnConstrainedWindowClosed(
-      ConstrainedWindowMac* window) OVERRIDE {
+      ConstrainedWindowMac* window) override {
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
     SetModel(NULL);
     ReleaseSoon();
diff --git a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_bridge.h b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_bridge.h
index 0fb8e96..5301abf 100644
--- a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_bridge.h
+++ b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_bridge.h
@@ -26,11 +26,11 @@ class DesktopMediaPickerBridge : public DesktopMediaListObserver {
   virtual ~DesktopMediaPickerBridge();
 
   // DesktopMediaListObserver overrides.
-  virtual void OnSourceAdded(int index) OVERRIDE;
-  virtual void OnSourceRemoved(int index) OVERRIDE;
-  virtual void OnSourceMoved(int old_index, int new_index) OVERRIDE;
-  virtual void OnSourceNameChanged(int index) OVERRIDE;
-  virtual void OnSourceThumbnailChanged(int index) OVERRIDE;
+  virtual void OnSourceAdded(int index) override;
+  virtual void OnSourceRemoved(int index) override;
+  virtual void OnSourceMoved(int old_index, int new_index) override;
+  virtual void OnSourceNameChanged(int index) override;
+  virtual void OnSourceThumbnailChanged(int index) override;
 
  private:
   id<DesktopMediaPickerObserver> observer_;  // weak; owns this
diff --git a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.h b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.h
index 13b0bc3..05d2eee 100644
--- a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.h
+++ b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_cocoa.h
@@ -23,7 +23,7 @@ class DesktopMediaPickerCocoa : public DesktopMediaPicker {
                     const base::string16& app_name,
                     const base::string16& target_name,
                     scoped_ptr<DesktopMediaList> media_list,
-                    const DoneCallback& done_callback) OVERRIDE;
+                    const DoneCallback& done_callback) override;
 
  private:
   base::scoped_nsobject<DesktopMediaPickerController> controller_;
diff --git a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm
index a3ded0f..569350c 100644
--- a/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/media_picker/desktop_media_picker_controller_unittest.mm
@@ -43,7 +43,7 @@ class DesktopMediaPickerControllerTest : public CocoaTest {
       : callback_called_(false), media_list_(NULL) {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaTest::SetUp();
 
     media_list_ = new FakeDesktopMediaList();
@@ -61,7 +61,7 @@ class DesktopMediaPickerControllerTest : public CocoaTest {
                    targetName:base::ASCIIToUTF16("https://foo.com")]);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     controller_.reset();
     CocoaTest::TearDown();
   }
diff --git a/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h b/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h
index 6f9fcc9..f336db4 100644
--- a/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h
+++ b/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h
@@ -35,14 +35,14 @@ class MessageCenterTrayBridge :
   virtual ~MessageCenterTrayBridge();
 
   // message_center::MessageCenterTrayDelegate:
-  virtual void OnMessageCenterTrayChanged() OVERRIDE;
-  virtual bool ShowPopups() OVERRIDE;
-  virtual void HidePopups() OVERRIDE;
-  virtual bool ShowMessageCenter() OVERRIDE;
-  virtual void HideMessageCenter() OVERRIDE;
-  virtual bool ShowNotifierSettings() OVERRIDE;
-  virtual bool IsContextMenuEnabled() const OVERRIDE;
-  virtual message_center::MessageCenterTray* GetMessageCenterTray() OVERRIDE;
+  virtual void OnMessageCenterTrayChanged() override;
+  virtual bool ShowPopups() override;
+  virtual void HidePopups() override;
+  virtual bool ShowMessageCenter() override;
+  virtual void HideMessageCenter() override;
+  virtual bool ShowNotifierSettings() override;
+  virtual bool IsContextMenuEnabled() const override;
+  virtual message_center::MessageCenterTray* GetMessageCenterTray() override;
 
   message_center::MessageCenter* message_center() { return message_center_; }
 
diff --git a/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge_unittest.mm b/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge_unittest.mm
index eda630c..91c7d29 100644
--- a/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge_unittest.mm
+++ b/chrome/browser/ui/cocoa/notifications/message_center_tray_bridge_unittest.mm
@@ -20,7 +20,7 @@
 
 class MessageCenterTrayBridgeTest : public ui::CocoaTest {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ui::CocoaTest::SetUp();
 
     local_state_.reset(
@@ -31,7 +31,7 @@ class MessageCenterTrayBridgeTest : public ui::CocoaTest {
     bridge_.reset(new MessageCenterTrayBridge(center_));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     bridge_.reset();
     message_center::MessageCenter::Shutdown();
     local_state_.reset();
@@ -70,7 +70,7 @@ class MessageCenterTrayBridgeTest : public ui::CocoaTest {
 class MessageCenterTrayBridgeTestPrefNever
     : public MessageCenterTrayBridgeTest {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     MessageCenterTrayBridgeTest::SetUp();
     local_state()->SetBoolean(prefs::kMessageCenterShowIcon, false);
   }
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell_unittest.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell_unittest.mm
index 9b08280..844ce41 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell_unittest.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_cell_unittest.mm
@@ -14,7 +14,7 @@ class OmniboxPopupCellTest : public CocoaTest {
   OmniboxPopupCellTest() {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaTest::SetUp();
     cell_.reset([[OmniboxPopupCell alloc] initTextCell:@""]);
     button_.reset([[NSButton alloc] initWithFrame:NSMakeRect(0, 0, 200, 20)]);
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix_unittest.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix_unittest.mm
index 8ffa641..663dc3a 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix_unittest.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_matrix_unittest.mm
@@ -26,25 +26,25 @@ class OmniboxPopupMatrixTest : public CocoaTest,
         middle_clicked_row_(0) {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaTest::SetUp();
     matrix_.reset([[OmniboxPopupMatrix alloc] initWithDelegate:this]);
     [[test_window() contentView] addSubview:matrix_];
   };
 
   virtual void OnMatrixRowSelected(OmniboxPopupMatrix* matrix,
-                                   size_t row) OVERRIDE {
+                                   size_t row) override {
     selected_row_ = row;
     [matrix_ selectCellAtRow:row column:0];
   }
 
   virtual void OnMatrixRowClicked(OmniboxPopupMatrix* matrix,
-                                size_t row) OVERRIDE {
+                                size_t row) override {
     clicked_row_ = row;
   }
 
   virtual void OnMatrixRowMiddleClicked(OmniboxPopupMatrix* matrix,
-                                        size_t row) OVERRIDE {
+                                        size_t row) override {
     middle_clicked_row_ = row;
   }
 
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h
index 2a6b6df..5d5ac02 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac.h
@@ -31,22 +31,22 @@ class OmniboxPopupViewMac : public OmniboxPopupView,
   virtual ~OmniboxPopupViewMac();
 
   // Overridden from OmniboxPopupView:
-  virtual bool IsOpen() const OVERRIDE;
-  virtual void InvalidateLine(size_t line) OVERRIDE {}
-  virtual void UpdatePopupAppearance() OVERRIDE;
-  virtual gfx::Rect GetTargetBounds() OVERRIDE;
+  virtual bool IsOpen() const override;
+  virtual void InvalidateLine(size_t line) override {}
+  virtual void UpdatePopupAppearance() override;
+  virtual gfx::Rect GetTargetBounds() override;
   // This is only called by model in SetSelectedLine() after updating
   // everything.  Popup should already be visible.
-  virtual void PaintUpdatesNow() OVERRIDE;
-  virtual void OnDragCanceled() OVERRIDE {}
+  virtual void PaintUpdatesNow() override;
+  virtual void OnDragCanceled() override {}
 
   // Overridden from OmniboxPopupMatrixDelegate:
   virtual void OnMatrixRowSelected(OmniboxPopupMatrix* matrix,
-                                   size_t row) OVERRIDE;
+                                   size_t row) override;
   virtual void OnMatrixRowClicked(OmniboxPopupMatrix* matrix,
-                                  size_t row) OVERRIDE;
+                                  size_t row) override;
   virtual void OnMatrixRowMiddleClicked(OmniboxPopupMatrix* matrix,
-                                        size_t row) OVERRIDE;
+                                        size_t row) override;
 
   OmniboxPopupMatrix* matrix() { return matrix_; }
 
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm
index dda51d2..1b88328 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_popup_view_mac_unittest.mm
@@ -33,7 +33,7 @@ class MockOmniboxPopupViewMac : public OmniboxPopupViewMac {
   }
 
  protected:
-  virtual const AutocompleteResult& GetResult() const OVERRIDE {
+  virtual const AutocompleteResult& GetResult() const override {
     return result_;
   }
 
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h
index 9283b08..74fb86c 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h
@@ -29,73 +29,73 @@ class OmniboxViewMac : public OmniboxView,
   virtual ~OmniboxViewMac();
 
   // OmniboxView:
-  virtual void SaveStateToTab(content::WebContents* tab) OVERRIDE;
-  virtual void OnTabChanged(const content::WebContents* web_contents) OVERRIDE;
-  virtual void Update() OVERRIDE;
-  virtual void UpdatePlaceholderText() OVERRIDE;
+  virtual void SaveStateToTab(content::WebContents* tab) override;
+  virtual void OnTabChanged(const content::WebContents* web_contents) override;
+  virtual void Update() override;
+  virtual void UpdatePlaceholderText() override;
   virtual void OpenMatch(const AutocompleteMatch& match,
                          WindowOpenDisposition disposition,
                          const GURL& alternate_nav_url,
                          const base::string16& pasted_text,
-                         size_t selected_line) OVERRIDE;
-  virtual base::string16 GetText() const OVERRIDE;
+                         size_t selected_line) override;
+  virtual base::string16 GetText() const override;
   virtual void SetWindowTextAndCaretPos(const base::string16& text,
                                         size_t caret_pos,
                                         bool update_popup,
-                                        bool notify_text_changed) OVERRIDE;
-  virtual void SetForcedQuery() OVERRIDE;
-  virtual bool IsSelectAll() const OVERRIDE;
-  virtual bool DeleteAtEndPressed() OVERRIDE;
+                                        bool notify_text_changed) override;
+  virtual void SetForcedQuery() override;
+  virtual bool IsSelectAll() const override;
+  virtual bool DeleteAtEndPressed() override;
   virtual void GetSelectionBounds(
       base::string16::size_type* start,
-      base::string16::size_type* end) const OVERRIDE;
-  virtual void SelectAll(bool reversed) OVERRIDE;
-  virtual void RevertAll() OVERRIDE;
-  virtual void UpdatePopup() OVERRIDE;
-  virtual void CloseOmniboxPopup() OVERRIDE;
-  virtual void SetFocus() OVERRIDE;
-  virtual void ApplyCaretVisibility() OVERRIDE;
+      base::string16::size_type* end) const override;
+  virtual void SelectAll(bool reversed) override;
+  virtual void RevertAll() override;
+  virtual void UpdatePopup() override;
+  virtual void CloseOmniboxPopup() override;
+  virtual void SetFocus() override;
+  virtual void ApplyCaretVisibility() override;
   virtual void OnTemporaryTextMaybeChanged(
       const base::string16& display_text,
       bool save_original_selection,
-      bool notify_text_changed) OVERRIDE;
+      bool notify_text_changed) override;
   virtual bool OnInlineAutocompleteTextMaybeChanged(
-      const base::string16& display_text, size_t user_text_length) OVERRIDE;
-  virtual void OnInlineAutocompleteTextCleared() OVERRIDE;
-  virtual void OnRevertTemporaryText() OVERRIDE;
-  virtual void OnBeforePossibleChange() OVERRIDE;
-  virtual bool OnAfterPossibleChange() OVERRIDE;
-  virtual gfx::NativeView GetNativeView() const OVERRIDE;
-  virtual gfx::NativeView GetRelativeWindowForPopup() const OVERRIDE;
-  virtual void SetGrayTextAutocompletion(const base::string16& input) OVERRIDE;
-  virtual base::string16 GetGrayTextAutocompletion() const OVERRIDE;
-  virtual int GetTextWidth() const OVERRIDE;
-  virtual int GetWidth() const OVERRIDE;
-  virtual bool IsImeComposing() const OVERRIDE;
+      const base::string16& display_text, size_t user_text_length) override;
+  virtual void OnInlineAutocompleteTextCleared() override;
+  virtual void OnRevertTemporaryText() override;
+  virtual void OnBeforePossibleChange() override;
+  virtual bool OnAfterPossibleChange() override;
+  virtual gfx::NativeView GetNativeView() const override;
+  virtual gfx::NativeView GetRelativeWindowForPopup() const override;
+  virtual void SetGrayTextAutocompletion(const base::string16& input) override;
+  virtual base::string16 GetGrayTextAutocompletion() const override;
+  virtual int GetTextWidth() const override;
+  virtual int GetWidth() const override;
+  virtual bool IsImeComposing() const override;
 
   // Implement the AutocompleteTextFieldObserver interface.
   virtual NSRange SelectionRangeForProposedRange(
-      NSRange proposed_range) OVERRIDE;
-  virtual void OnControlKeyChanged(bool pressed) OVERRIDE;
-  virtual bool CanCopy() OVERRIDE;
-  virtual void CopyToPasteboard(NSPasteboard* pboard) OVERRIDE;
-  virtual bool ShouldEnableShowURL() OVERRIDE;
-  virtual void ShowURL() OVERRIDE;
-  virtual void OnPaste() OVERRIDE;
-  virtual bool CanPasteAndGo() OVERRIDE;
-  virtual int GetPasteActionStringId() OVERRIDE;
-  virtual void OnPasteAndGo() OVERRIDE;
-  virtual void OnFrameChanged() OVERRIDE;
-  virtual void ClosePopup() OVERRIDE;
-  virtual void OnDidBeginEditing() OVERRIDE;
-  virtual void OnBeforeChange() OVERRIDE;
-  virtual void OnDidChange() OVERRIDE;
-  virtual void OnDidEndEditing() OVERRIDE;
-  virtual bool OnDoCommandBySelector(SEL cmd) OVERRIDE;
-  virtual void OnSetFocus(bool control_down) OVERRIDE;
-  virtual void OnKillFocus() OVERRIDE;
-  virtual void OnMouseDown(NSInteger button_number) OVERRIDE;
-  virtual bool ShouldSelectAllOnMouseDown() OVERRIDE;
+      NSRange proposed_range) override;
+  virtual void OnControlKeyChanged(bool pressed) override;
+  virtual bool CanCopy() override;
+  virtual void CopyToPasteboard(NSPasteboard* pboard) override;
+  virtual bool ShouldEnableShowURL() override;
+  virtual void ShowURL() override;
+  virtual void OnPaste() override;
+  virtual bool CanPasteAndGo() override;
+  virtual int GetPasteActionStringId() override;
+  virtual void OnPasteAndGo() override;
+  virtual void OnFrameChanged() override;
+  virtual void ClosePopup() override;
+  virtual void OnDidBeginEditing() override;
+  virtual void OnBeforeChange() override;
+  virtual void OnDidChange() override;
+  virtual void OnDidEndEditing() override;
+  virtual bool OnDoCommandBySelector(SEL cmd) override;
+  virtual void OnSetFocus(bool control_down) override;
+  virtual void OnKillFocus() override;
+  virtual void OnMouseDown(NSInteger button_number) override;
+  virtual bool ShouldSelectAllOnMouseDown() override;
 
   // Helper for LocationBarViewMac.  Optionally selects all in |field_|.
   void FocusLocation(bool select_all);
@@ -154,7 +154,7 @@ class OmniboxViewMac : public OmniboxView,
   // Pass the current content of |field_| to SetText(), maintaining
   // any selection.  Named to be consistent with GTK and Windows,
   // though here we cannot really do the in-place operation they do.
-  virtual void EmphasizeURLComponents() OVERRIDE;
+  virtual void EmphasizeURLComponents() override;
 
   // Calculates text attributes according to |display_text| and applies them
   // to the given |as| object.
@@ -163,7 +163,7 @@ class OmniboxViewMac : public OmniboxView,
 
   // Return the number of UTF-16 units in the current buffer, excluding the
   // suggested text.
-  virtual int GetOmniboxTextLength() const OVERRIDE;
+  virtual int GetOmniboxTextLength() const override;
   NSUInteger GetTextLength() const;
 
   // Returns true if the caret is at the end of the content.
diff --git a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm
index e0c13b6..add98dc 100644
--- a/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm
+++ b/chrome/browser/ui/cocoa/omnibox/omnibox_view_mac_unittest.mm
@@ -27,7 +27,7 @@ class MockOmniboxEditModel : public OmniboxEditModel {
         up_or_down_count_(0) {
   }
 
-  virtual void OnUpOrDownKeyPressed(int count) OVERRIDE {
+  virtual void OnUpOrDownKeyPressed(int count) override {
     up_or_down_count_ = count;
   }
 
@@ -49,12 +49,12 @@ class MockOmniboxPopupView : public OmniboxPopupView {
   virtual ~MockOmniboxPopupView() {}
 
   // Overridden from OmniboxPopupView:
-  virtual bool IsOpen() const OVERRIDE { return is_open_; }
-  virtual void InvalidateLine(size_t line) OVERRIDE {}
-  virtual void UpdatePopupAppearance() OVERRIDE {}
-  virtual gfx::Rect GetTargetBounds() OVERRIDE { return gfx::Rect(); }
-  virtual void PaintUpdatesNow() OVERRIDE {}
-  virtual void OnDragCanceled() OVERRIDE {}
+  virtual bool IsOpen() const override { return is_open_; }
+  virtual void InvalidateLine(size_t line) override {}
+  virtual void UpdatePopupAppearance() override {}
+  virtual gfx::Rect GetTargetBounds() override { return gfx::Rect(); }
+  virtual void PaintUpdatesNow() override {}
+  virtual void OnDragCanceled() override {}
 
   void set_is_open(bool is_open) { is_open_ = is_open; }
 
@@ -70,10 +70,10 @@ class TestingToolbarModelDelegate : public ToolbarModelDelegate {
   virtual ~TestingToolbarModelDelegate() {}
 
   // Overridden from ToolbarModelDelegate:
-  virtual content::WebContents* GetActiveWebContents() const OVERRIDE {
+  virtual content::WebContents* GetActiveWebContents() const override {
     return NULL;
   }
-  virtual bool InTabbedBrowser() const OVERRIDE {
+  virtual bool InTabbedBrowser() const override {
     return true;
   }
 
@@ -91,16 +91,16 @@ class TestingOmniboxEditController : public OmniboxEditController {
 
  protected:
   // Overridden from OmniboxEditController:
-  virtual void Update(const content::WebContents* contents) OVERRIDE {}
-  virtual void OnChanged() OVERRIDE {}
-  virtual void OnSetFocus() OVERRIDE {}
-  virtual void ShowURL() OVERRIDE {}
-  virtual void HideURL() OVERRIDE {}
-  virtual void EndOriginChipAnimations(bool cancel_fade) OVERRIDE {}
-  virtual InstantController* GetInstant() OVERRIDE { return NULL; }
-  virtual content::WebContents* GetWebContents() OVERRIDE { return NULL; }
-  virtual ToolbarModel* GetToolbarModel() OVERRIDE { return toolbar_model_; }
-  virtual const ToolbarModel* GetToolbarModel() const OVERRIDE {
+  virtual void Update(const content::WebContents* contents) override {}
+  virtual void OnChanged() override {}
+  virtual void OnSetFocus() override {}
+  virtual void ShowURL() override {}
+  virtual void HideURL() override {}
+  virtual void EndOriginChipAnimations(bool cancel_fade) override {}
+  virtual InstantController* GetInstant() override { return NULL; }
+  virtual content::WebContents* GetWebContents() override { return NULL; }
+  virtual ToolbarModel* GetToolbarModel() override { return toolbar_model_; }
+  virtual const ToolbarModel* GetToolbarModel() const override {
     return toolbar_model_;
   }
 
diff --git a/chrome/browser/ui/cocoa/one_click_signin_bubble_controller_browsertest.mm b/chrome/browser/ui/cocoa/one_click_signin_bubble_controller_browsertest.mm
index 0387770..ece1768 100644
--- a/chrome/browser/ui/cocoa/one_click_signin_bubble_controller_browsertest.mm
+++ b/chrome/browser/ui/cocoa/one_click_signin_bubble_controller_browsertest.mm
@@ -20,7 +20,7 @@ class OneClickSigninBubbleControllerTest : public InProcessBrowserTest {
   }
 
  protected:
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     content::WebContents* web_contents =
         browser()->tab_strip_model()->GetWebContentsAt(0);
     BrowserWindow::StartSyncCallback callback = base::Bind(
diff --git a/chrome/browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm
index a60e3a2..db9eafb 100644
--- a/chrome/browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm
@@ -30,7 +30,7 @@ class OneClickSigninBubbleControllerTest : public CocoaProfileTest {
             base::Bind(&OneClickSigninBubbleControllerTest::OnStartSync,
                        weak_ptr_factory_.GetWeakPtr())) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaProfileTest::SetUp();
     BrowserWindowCocoa* browser_window =
         static_cast<BrowserWindowCocoa*>(browser()->window());
@@ -44,7 +44,7 @@ class OneClickSigninBubbleControllerTest : public CocoaProfileTest {
                 [[controller_ viewController] nibName]);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     controller_.reset();
     CocoaProfileTest::TearDown();
   }
diff --git a/chrome/browser/ui/cocoa/one_click_signin_dialog_controller.h b/chrome/browser/ui/cocoa/one_click_signin_dialog_controller.h
index 2df8972..4fc9f30 100644
--- a/chrome/browser/ui/cocoa/one_click_signin_dialog_controller.h
+++ b/chrome/browser/ui/cocoa/one_click_signin_dialog_controller.h
@@ -32,7 +32,7 @@ class OneClickSigninDialogController : public ConstrainedWindowMacDelegate {
 
   // ConstrainedWindowMacDelegate implementation.
   virtual void OnConstrainedWindowClosed(
-      ConstrainedWindowMac* window) OVERRIDE;
+      ConstrainedWindowMac* window) override;
 
   ConstrainedWindowMac* constrained_window() const {
     return constrained_window_.get();
diff --git a/chrome/browser/ui/cocoa/one_click_signin_dialog_controller_browsertest.mm b/chrome/browser/ui/cocoa/one_click_signin_dialog_controller_browsertest.mm
index 5af7611..54b3899 100644
--- a/chrome/browser/ui/cocoa/one_click_signin_dialog_controller_browsertest.mm
+++ b/chrome/browser/ui/cocoa/one_click_signin_dialog_controller_browsertest.mm
@@ -20,7 +20,7 @@ class OneClickSigninDialogControllerTest : public InProcessBrowserTest {
   }
 
  protected:
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     content::WebContents* web_contents =
         browser()->tab_strip_model()->GetWebContentsAt(0);
     BrowserWindow::StartSyncCallback callback = base::Bind(
diff --git a/chrome/browser/ui/cocoa/panels/display_settings_provider_cocoa.mm b/chrome/browser/ui/cocoa/panels/display_settings_provider_cocoa.mm
index 8577a45..9a187bf 100644
--- a/chrome/browser/ui/cocoa/panels/display_settings_provider_cocoa.mm
+++ b/chrome/browser/ui/cocoa/panels/display_settings_provider_cocoa.mm
@@ -36,16 +36,16 @@ class DisplaySettingsProviderCocoa : public DisplaySettingsProvider,
 
  protected:
   // Overridden from DisplaySettingsProvider:
-  virtual bool NeedsPeriodicFullScreenCheck() const OVERRIDE;
-  virtual bool IsFullScreen() OVERRIDE;
+  virtual bool NeedsPeriodicFullScreenCheck() const override;
+  virtual bool IsFullScreen() override;
 
   // Overridden from ui::WorkAreaWatcherObserver:
-  virtual void WorkAreaChanged() OVERRIDE;
+  virtual void WorkAreaChanged() override;
 
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
  private:
   void ActiveWorkSpaceChanged();
diff --git a/chrome/browser/ui/cocoa/panels/panel_cocoa.h b/chrome/browser/ui/cocoa/panels/panel_cocoa.h
index a453341..2977c93 100644
--- a/chrome/browser/ui/cocoa/panels/panel_cocoa.h
+++ b/chrome/browser/ui/cocoa/panels/panel_cocoa.h
@@ -22,50 +22,50 @@ class PanelCocoa : public NativePanel {
   virtual ~PanelCocoa();
 
   // Overridden from NativePanel
-  virtual void ShowPanel() OVERRIDE;
-  virtual void ShowPanelInactive() OVERRIDE;
-  virtual gfx::Rect GetPanelBounds() const OVERRIDE;
-  virtual void SetPanelBounds(const gfx::Rect& bounds) OVERRIDE;
-  virtual void SetPanelBoundsInstantly(const gfx::Rect& bounds) OVERRIDE;
-  virtual void ClosePanel() OVERRIDE;
-  virtual void ActivatePanel() OVERRIDE;
-  virtual void DeactivatePanel() OVERRIDE;
-  virtual bool IsPanelActive() const OVERRIDE;
-  virtual void PreventActivationByOS(bool prevent_activation) OVERRIDE;
-  virtual gfx::NativeWindow GetNativePanelWindow() OVERRIDE;
-  virtual void UpdatePanelTitleBar() OVERRIDE;
-  virtual void UpdatePanelLoadingAnimations(bool should_animate) OVERRIDE;
-  virtual void PanelWebContentsFocused(content::WebContents* contents) OVERRIDE;
-  virtual void PanelCut() OVERRIDE;
-  virtual void PanelCopy() OVERRIDE;
-  virtual void PanelPaste() OVERRIDE;
-  virtual void DrawAttention(bool draw_attention) OVERRIDE;
-  virtual bool IsDrawingAttention() const OVERRIDE;
+  virtual void ShowPanel() override;
+  virtual void ShowPanelInactive() override;
+  virtual gfx::Rect GetPanelBounds() const override;
+  virtual void SetPanelBounds(const gfx::Rect& bounds) override;
+  virtual void SetPanelBoundsInstantly(const gfx::Rect& bounds) override;
+  virtual void ClosePanel() override;
+  virtual void ActivatePanel() override;
+  virtual void DeactivatePanel() override;
+  virtual bool IsPanelActive() const override;
+  virtual void PreventActivationByOS(bool prevent_activation) override;
+  virtual gfx::NativeWindow GetNativePanelWindow() override;
+  virtual void UpdatePanelTitleBar() override;
+  virtual void UpdatePanelLoadingAnimations(bool should_animate) override;
+  virtual void PanelWebContentsFocused(content::WebContents* contents) override;
+  virtual void PanelCut() override;
+  virtual void PanelCopy() override;
+  virtual void PanelPaste() override;
+  virtual void DrawAttention(bool draw_attention) override;
+  virtual bool IsDrawingAttention() const override;
   virtual void HandlePanelKeyboardEvent(
-      const content::NativeWebKeyboardEvent& event) OVERRIDE;
-  virtual void FullScreenModeChanged(bool is_full_screen) OVERRIDE;
-  virtual bool IsPanelAlwaysOnTop() const OVERRIDE;
-  virtual void SetPanelAlwaysOnTop(bool on_top) OVERRIDE;
-  virtual void UpdatePanelMinimizeRestoreButtonVisibility() OVERRIDE;
-  virtual void SetWindowCornerStyle(panel::CornerStyle corner_style) OVERRIDE;
+      const content::NativeWebKeyboardEvent& event) override;
+  virtual void FullScreenModeChanged(bool is_full_screen) override;
+  virtual bool IsPanelAlwaysOnTop() const override;
+  virtual void SetPanelAlwaysOnTop(bool on_top) override;
+  virtual void UpdatePanelMinimizeRestoreButtonVisibility() override;
+  virtual void SetWindowCornerStyle(panel::CornerStyle corner_style) override;
   virtual void PanelExpansionStateChanging(
       Panel::ExpansionState old_state,
-      Panel::ExpansionState new_state) OVERRIDE;
-  virtual void AttachWebContents(content::WebContents* contents) OVERRIDE;
-  virtual void DetachWebContents(content::WebContents* contents) OVERRIDE;
+      Panel::ExpansionState new_state) override;
+  virtual void AttachWebContents(content::WebContents* contents) override;
+  virtual void DetachWebContents(content::WebContents* contents) override;
 
   // These sizes are in screen coordinates.
   virtual gfx::Size WindowSizeFromContentSize(
-      const gfx::Size& content_size) const OVERRIDE;
+      const gfx::Size& content_size) const override;
   virtual gfx::Size ContentSizeFromWindowSize(
-      const gfx::Size& window_size) const OVERRIDE;
-  virtual int TitleOnlyHeight() const OVERRIDE;
-
-  virtual void MinimizePanelBySystem() OVERRIDE;
-  virtual bool IsPanelMinimizedBySystem() const OVERRIDE;
-  virtual bool IsPanelShownOnActiveDesktop() const OVERRIDE;
-  virtual void ShowShadow(bool show) OVERRIDE;
-  virtual NativePanelTesting* CreateNativePanelTesting() OVERRIDE;
+      const gfx::Size& window_size) const override;
+  virtual int TitleOnlyHeight() const override;
+
+  virtual void MinimizePanelBySystem() override;
+  virtual bool IsPanelMinimizedBySystem() const override;
+  virtual bool IsPanelShownOnActiveDesktop() const override;
+  virtual void ShowShadow(bool show) override;
+  virtual NativePanelTesting* CreateNativePanelTesting() override;
 
   Panel* panel() const;
   void DidCloseNativeWindow();
diff --git a/chrome/browser/ui/cocoa/panels/panel_cocoa.mm b/chrome/browser/ui/cocoa/panels/panel_cocoa.mm
index 9ab696e..8fe8fc1 100644
--- a/chrome/browser/ui/cocoa/panels/panel_cocoa.mm
+++ b/chrome/browser/ui/cocoa/panels/panel_cocoa.mm
@@ -327,23 +327,23 @@ class CocoaNativePanelTesting : public NativePanelTesting {
   virtual ~CocoaNativePanelTesting() { }
   // Overridden from NativePanelTesting
   virtual void PressLeftMouseButtonTitlebar(
-      const gfx::Point& mouse_location, panel::ClickModifier modifier) OVERRIDE;
+      const gfx::Point& mouse_location, panel::ClickModifier modifier) override;
   virtual void ReleaseMouseButtonTitlebar(
-      panel::ClickModifier modifier) OVERRIDE;
-  virtual void DragTitlebar(const gfx::Point& mouse_location) OVERRIDE;
-  virtual void CancelDragTitlebar() OVERRIDE;
-  virtual void FinishDragTitlebar() OVERRIDE;
-  virtual bool VerifyDrawingAttention() const OVERRIDE;
-  virtual bool VerifyActiveState(bool is_active) OVERRIDE;
-  virtual bool VerifyAppIcon() const OVERRIDE;
-  virtual bool VerifySystemMinimizeState() const OVERRIDE;
-  virtual bool IsWindowVisible() const OVERRIDE;
-  virtual bool IsWindowSizeKnown() const OVERRIDE;
-  virtual bool IsAnimatingBounds() const OVERRIDE;
+      panel::ClickModifier modifier) override;
+  virtual void DragTitlebar(const gfx::Point& mouse_location) override;
+  virtual void CancelDragTitlebar() override;
+  virtual void FinishDragTitlebar() override;
+  virtual bool VerifyDrawingAttention() const override;
+  virtual bool VerifyActiveState(bool is_active) override;
+  virtual bool VerifyAppIcon() const override;
+  virtual bool VerifySystemMinimizeState() const override;
+  virtual bool IsWindowVisible() const override;
+  virtual bool IsWindowSizeKnown() const override;
+  virtual bool IsAnimatingBounds() const override;
   virtual bool IsButtonVisible(
-      panel::TitlebarButtonType button_type) const OVERRIDE;
-  virtual panel::CornerStyle GetWindowCornerStyle() const OVERRIDE;
-  virtual bool EnsureApplicationRunOnForeground() OVERRIDE;
+      panel::TitlebarButtonType button_type) const override;
+  virtual panel::CornerStyle GetWindowCornerStyle() const override;
+  virtual bool EnsureApplicationRunOnForeground() override;
 
  private:
   PanelTitlebarViewCocoa* titlebar() const;
diff --git a/chrome/browser/ui/cocoa/panels/panel_stack_window_cocoa.h b/chrome/browser/ui/cocoa/panels/panel_stack_window_cocoa.h
index 442044c..f5dac23 100644
--- a/chrome/browser/ui/cocoa/panels/panel_stack_window_cocoa.h
+++ b/chrome/browser/ui/cocoa/panels/panel_stack_window_cocoa.h
@@ -33,22 +33,22 @@ class PanelStackWindowCocoa : public NativePanelStackWindow {
 
  protected:
   // Overridden from NativePanelStackWindow:
-  virtual void Close() OVERRIDE;
-  virtual void AddPanel(Panel* panel) OVERRIDE;
-  virtual void RemovePanel(Panel* panel) OVERRIDE;
-  virtual void MergeWith(NativePanelStackWindow* another) OVERRIDE;
-  virtual bool IsEmpty() const OVERRIDE;
-  virtual bool HasPanel(Panel* panel) const OVERRIDE;
-  virtual void MovePanelsBy(const gfx::Vector2d& delta) OVERRIDE;
-  virtual void BeginBatchUpdatePanelBounds(bool animate) OVERRIDE;
+  virtual void Close() override;
+  virtual void AddPanel(Panel* panel) override;
+  virtual void RemovePanel(Panel* panel) override;
+  virtual void MergeWith(NativePanelStackWindow* another) override;
+  virtual bool IsEmpty() const override;
+  virtual bool HasPanel(Panel* panel) const override;
+  virtual void MovePanelsBy(const gfx::Vector2d& delta) override;
+  virtual void BeginBatchUpdatePanelBounds(bool animate) override;
   virtual void AddPanelBoundsForBatchUpdate(Panel* panel,
-                                            const gfx::Rect& bounds) OVERRIDE;
-  virtual void EndBatchUpdatePanelBounds() OVERRIDE;
-  virtual bool IsAnimatingPanelBounds() const OVERRIDE;
-  virtual void Minimize() OVERRIDE;
-  virtual bool IsMinimized() const OVERRIDE;
-  virtual void DrawSystemAttention(bool draw_attention) OVERRIDE;
-  virtual void OnPanelActivated(Panel* panel) OVERRIDE;
+                                            const gfx::Rect& bounds) override;
+  virtual void EndBatchUpdatePanelBounds() override;
+  virtual bool IsAnimatingPanelBounds() const override;
+  virtual void Minimize() override;
+  virtual bool IsMinimized() const override;
+  virtual void DrawSystemAttention(bool draw_attention) override;
+  virtual void OnPanelActivated(Panel* panel) override;
 
  private:
   typedef std::list<Panel*> Panels;
diff --git a/chrome/browser/ui/cocoa/passwords/manage_password_item_view_controller_unittest.mm b/chrome/browser/ui/cocoa/passwords/manage_password_item_view_controller_unittest.mm
index 215ff8b..ff7ac5a 100644
--- a/chrome/browser/ui/cocoa/passwords/manage_password_item_view_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/passwords/manage_password_item_view_controller_unittest.mm
@@ -38,7 +38,7 @@ class ManagePasswordItemViewControllerTest
   ManagePasswordItemViewControllerTest() {}
   virtual ~ManagePasswordItemViewControllerTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ManagePasswordsControllerTest::SetUp();
     PasswordStoreFactory::GetInstance()->SetTestingFactory(
         profile(), MockPasswordStoreService::Build);
diff --git a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_blacklist_view_controller_unittest.mm b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_blacklist_view_controller_unittest.mm
index 2098d1b..00c9719 100644
--- a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_blacklist_view_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_blacklist_view_controller_unittest.mm
@@ -38,7 +38,7 @@ class ManagePasswordsBubbleBlacklistViewControllerTest
  public:
   ManagePasswordsBubbleBlacklistViewControllerTest() : controller_(nil) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ManagePasswordsControllerTest::SetUp();
     delegate_.reset(
         [[ManagePasswordsBubbleBlacklistViewTestDelegate alloc] init]);
diff --git a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_browsertest.mm b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_browsertest.mm
index b01298e..8824e17 100644
--- a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_browsertest.mm
+++ b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_browsertest.mm
@@ -32,12 +32,12 @@
 // Integration tests for the Mac password bubble.
 class ManagePasswordsBubbleTest : public ManagePasswordsTest {
  public:
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     ManagePasswordsTest::SetUpOnMainThread();
     browser()->window()->Show();
   }
 
-  virtual void TearDownOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() override {
     ManagePasswordsTest::TearDownOnMainThread();
   }
 
@@ -68,7 +68,7 @@ class ManagePasswordsBubbleTest : public ManagePasswordsTest {
     return [bwc locationBarBridge]->manage_passwords_decoration();
   }
 
-  virtual ManagePasswordsIcon* view() OVERRIDE {
+  virtual ManagePasswordsIcon* view() override {
     return decoration()->icon();
   }
 };
diff --git a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_cocoa_unittest.mm b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_cocoa_unittest.mm
index 348bed5..b5d90c7 100644
--- a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_cocoa_unittest.mm
+++ b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_cocoa_unittest.mm
@@ -29,7 +29,7 @@
 
 class ManagePasswordsBubbleCocoaTest : public CocoaProfileTest {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaProfileTest::SetUp();
 
     // Create the WebContents.
diff --git a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_confirmation_view_controller_unittest.mm b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_confirmation_view_controller_unittest.mm
index cf4c6f5..5acdfbe 100644
--- a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_confirmation_view_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_confirmation_view_controller_unittest.mm
@@ -40,7 +40,7 @@ class ManagePasswordsBubbleConfirmationViewControllerTest
  public:
   ManagePasswordsBubbleConfirmationViewControllerTest() : controller_(nil) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ManagePasswordsControllerTest::SetUp();
     delegate_.reset(
         [[ManagePasswordsBubbleContentViewTestDelegate alloc] init]);
diff --git a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_controller_unittest.mm
index 5e4ad95..4bb9c04 100644
--- a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_controller_unittest.mm
@@ -28,7 +28,7 @@ class ManagePasswordsBubbleControllerTest
  public:
   ManagePasswordsBubbleControllerTest() : controller_(nil) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ManagePasswordsControllerTest::SetUp();
   }
 
diff --git a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_manage_view_controller_unittest.mm b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_manage_view_controller_unittest.mm
index 90f197b..6c57f6c 100644
--- a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_manage_view_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_manage_view_controller_unittest.mm
@@ -37,7 +37,7 @@ class ManagePasswordsBubbleManageViewControllerTest
  public:
   ManagePasswordsBubbleManageViewControllerTest() : controller_(nil) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ManagePasswordsControllerTest::SetUp();
     delegate_.reset(
         [[ManagePasswordsBubbleManageViewTestDelegate alloc] init]);
diff --git a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_never_save_view_controller_unittest.mm b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_never_save_view_controller_unittest.mm
index 06bc101..e085d99 100644
--- a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_never_save_view_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_never_save_view_controller_unittest.mm
@@ -44,7 +44,7 @@ class ManagePasswordsBubbleNeverSaveViewControllerTest
  public:
   ManagePasswordsBubbleNeverSaveViewControllerTest() : controller_(nil) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ManagePasswordsControllerTest::SetUp();
     delegate_.reset(
         [[ManagePasswordsBubbleNeverSaveViewTestDelegate alloc] init]);
diff --git a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_pending_view_controller_unittest.mm b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_pending_view_controller_unittest.mm
index ac5dcf836..9783165 100644
--- a/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_pending_view_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/passwords/manage_passwords_bubble_pending_view_controller_unittest.mm
@@ -54,7 +54,7 @@ class ManagePasswordsBubblePendingViewControllerTest
  public:
   ManagePasswordsBubblePendingViewControllerTest() : controller_(nil) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ManagePasswordsControllerTest::SetUp();
     delegate_.reset(
         [[ManagePasswordsBubblePendingViewTestDelegate alloc] init]);
diff --git a/chrome/browser/ui/cocoa/passwords/manage_passwords_controller_test.h b/chrome/browser/ui/cocoa/passwords/manage_passwords_controller_test.h
index 94682ac..70bb40a 100644
--- a/chrome/browser/ui/cocoa/passwords/manage_passwords_controller_test.h
+++ b/chrome/browser/ui/cocoa/passwords/manage_passwords_controller_test.h
@@ -19,7 +19,7 @@ class ManagePasswordsControllerTest : public CocoaProfileTest {
  public:
   ManagePasswordsControllerTest();
   virtual ~ManagePasswordsControllerTest();
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   ManagePasswordsUIControllerMock* ui_controller() { return ui_controller_; }
   ManagePasswordsBubbleModel* model();
diff --git a/chrome/browser/ui/cocoa/pdf_password_dialog.mm b/chrome/browser/ui/cocoa/pdf_password_dialog.mm
index bfde5a8..003af27 100644
--- a/chrome/browser/ui/cocoa/pdf_password_dialog.mm
+++ b/chrome/browser/ui/cocoa/pdf_password_dialog.mm
@@ -24,7 +24,7 @@ class PDFPasswordDialogMacBridge : public ConstrainedWindowMacDelegate {
  public:
   explicit PDFPasswordDialogMacBridge(PDFPasswordDialogMac* dialog);
   virtual ~PDFPasswordDialogMacBridge();
-  virtual void OnConstrainedWindowClosed(ConstrainedWindowMac* window) OVERRIDE;
+  virtual void OnConstrainedWindowClosed(ConstrainedWindowMac* window) override;
 
  private:
   PDFPasswordDialogMac* dialog_;  // weak
diff --git a/chrome/browser/ui/cocoa/presentation_mode_controller_unittest.mm b/chrome/browser/ui/cocoa/presentation_mode_controller_unittest.mm
index ae04a46..c9511bc 100644
--- a/chrome/browser/ui/cocoa/presentation_mode_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/presentation_mode_controller_unittest.mm
@@ -116,7 +116,7 @@ void CheckLayoutNoOverlap(BrowserWindowController* controller) {
 // -------------------PresentationModeControllerTest----------------------------
 class PresentationModeControllerTest : public CocoaProfileTest {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(browser());
 
@@ -127,7 +127,7 @@ class PresentationModeControllerTest : public CocoaProfileTest {
          changeType:BookmarkBar::DONT_ANIMATE_STATE_CHANGE];
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     [controller_ close];
     CocoaProfileTest::TearDown();
   }
diff --git a/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm b/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm
index 86b3cf7..20273b6 100644
--- a/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm
+++ b/chrome/browser/ui/cocoa/profiles/avatar_base_controller.mm
@@ -74,34 +74,34 @@ class ProfileInfoUpdateObserver : public ProfileInfoCacheObserver,
   }
 
   // ProfileInfoCacheObserver:
-  virtual void OnProfileAdded(const base::FilePath& profile_path) OVERRIDE {
+  virtual void OnProfileAdded(const base::FilePath& profile_path) override {
     [avatarController_ updateAvatarButtonAndLayoutParent:YES];
   }
 
   virtual void OnProfileWasRemoved(
       const base::FilePath& profile_path,
-      const base::string16& profile_name) OVERRIDE {
+      const base::string16& profile_name) override {
     [avatarController_ updateAvatarButtonAndLayoutParent:YES];
   }
 
   virtual void OnProfileNameChanged(
       const base::FilePath& profile_path,
-      const base::string16& old_profile_name) OVERRIDE {
+      const base::string16& old_profile_name) override {
     [avatarController_ updateAvatarButtonAndLayoutParent:YES];
   }
 
   virtual void OnProfileAvatarChanged(
-      const base::FilePath& profile_path) OVERRIDE {
+      const base::FilePath& profile_path) override {
     [avatarController_ updateAvatarButtonAndLayoutParent:YES];
   }
 
   virtual void OnProfileSupervisedUserIdChanged(
-      const base::FilePath& profile_path) OVERRIDE {
+      const base::FilePath& profile_path) override {
     [avatarController_ updateAvatarButtonAndLayoutParent:YES];
   }
 
   // SigninErrorController::Observer:
-  virtual void OnErrorChanged() OVERRIDE {
+  virtual void OnErrorChanged() override {
     SigninErrorController* errorController =
         profiles::GetSigninErrorController(profile_);
     if (errorController)
diff --git a/chrome/browser/ui/cocoa/profiles/avatar_button_controller_unittest.mm b/chrome/browser/ui/cocoa/profiles/avatar_button_controller_unittest.mm
index 75119e5..185269d 100644
--- a/chrome/browser/ui/cocoa/profiles/avatar_button_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/profiles/avatar_button_controller_unittest.mm
@@ -31,7 +31,7 @@
 
 class AvatarButtonControllerTest : public CocoaProfileTest {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     switches::EnableNewAvatarMenuForTesting(CommandLine::ForCurrentProcess());
     DCHECK(profiles::IsMultipleProfilesEnabled());
 
@@ -42,7 +42,7 @@ class AvatarButtonControllerTest : public CocoaProfileTest {
         [[AvatarButtonController alloc] initWithBrowser:browser()]);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     browser()->window()->Close();
     CocoaProfileTest::TearDown();
   }
diff --git a/chrome/browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm b/chrome/browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm
index 49c0197..36a6496 100644
--- a/chrome/browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/profiles/avatar_icon_controller_unittest.mm
@@ -26,7 +26,7 @@
 
 class AvatarIconControllerTest : public CocoaProfileTest {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(browser());
 
@@ -35,7 +35,7 @@ class AvatarIconControllerTest : public CocoaProfileTest {
     [[controller_ view] setHidden:YES];
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     browser()->window()->Close();
     CocoaProfileTest::TearDown();
   }
diff --git a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
index 3392671..621a6e7 100644
--- a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
+++ b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller.mm
@@ -288,7 +288,7 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,
   }
 
   // OAuth2TokenService::Observer:
-  virtual void OnRefreshTokenAvailable(const std::string& account_id) OVERRIDE {
+  virtual void OnRefreshTokenAvailable(const std::string& account_id) override {
     // Tokens can only be added by adding an account through the inline flow,
     // which is started from the account management view. Refresh it to show the
     // update.
@@ -303,7 +303,7 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,
     }
   }
 
-  virtual void OnRefreshTokenRevoked(const std::string& account_id) OVERRIDE {
+  virtual void OnRefreshTokenRevoked(const std::string& account_id) override {
     // Tokens can only be removed from the account management view. Refresh it
     // to show the update.
     if ([controller_ viewMode] == profiles::BUBBLE_VIEW_MODE_ACCOUNT_MANAGEMENT)
@@ -312,7 +312,7 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,
   }
 
   // AvatarMenuObserver:
-  virtual void OnAvatarMenuChanged(AvatarMenu* avatar_menu) OVERRIDE {
+  virtual void OnAvatarMenuChanged(AvatarMenu* avatar_menu) override {
     profiles::BubbleViewMode viewMode = [controller_ viewMode];
     if (viewMode == profiles::BUBBLE_VIEW_MODE_PROFILE_CHOOSER ||
         viewMode == profiles::BUBBLE_VIEW_MODE_ACCOUNT_MANAGEMENT) {
@@ -324,7 +324,7 @@ class ActiveProfileObserverBridge : public AvatarMenuObserver,
   virtual void Observe(
       int type,
       const content::NotificationSource& source,
-      const content::NotificationDetails& details) OVERRIDE {
+      const content::NotificationDetails& details) override {
     DCHECK_EQ(chrome::NOTIFICATION_BROWSER_CLOSING, type);
     if (browser_ == content::Source<Browser>(source).ptr()) {
       RemoveTokenServiceObserver();
diff --git a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
index f43ad9e..ebbfc66 100644
--- a/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/profiles/profile_chooser_controller_unittest.mm
@@ -37,7 +37,7 @@ class ProfileChooserControllerTest : public CocoaProfileTest {
   ProfileChooserControllerTest() {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(browser()->profile());
 
@@ -68,7 +68,7 @@ class ProfileChooserControllerTest : public CocoaProfileTest {
     EXPECT_EQ(3U, menu_->GetNumberOfItems());
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     [controller() close];
     controller_.reset();
     CocoaProfileTest::TearDown();
diff --git a/chrome/browser/ui/cocoa/profiles/profile_menu_controller.mm b/chrome/browser/ui/cocoa/profiles/profile_menu_controller.mm
index b328d7a..5885b7f 100644
--- a/chrome/browser/ui/cocoa/profiles/profile_menu_controller.mm
+++ b/chrome/browser/ui/cocoa/profiles/profile_menu_controller.mm
@@ -42,16 +42,16 @@ class Observer : public chrome::BrowserListObserver,
   }
 
   // chrome::BrowserListObserver:
-  virtual void OnBrowserAdded(Browser* browser) OVERRIDE {}
-  virtual void OnBrowserRemoved(Browser* browser) OVERRIDE {
+  virtual void OnBrowserAdded(Browser* browser) override {}
+  virtual void OnBrowserRemoved(Browser* browser) override {
     [controller_ activeBrowserChangedTo:chrome::GetLastActiveBrowser()];
   }
-  virtual void OnBrowserSetLastActive(Browser* browser) OVERRIDE {
+  virtual void OnBrowserSetLastActive(Browser* browser) override {
     [controller_ activeBrowserChangedTo:browser];
   }
 
   // AvatarMenuObserver:
-  virtual void OnAvatarMenuChanged(AvatarMenu* menu) OVERRIDE {
+  virtual void OnAvatarMenuChanged(AvatarMenu* menu) override {
     [controller_ rebuildMenu];
   }
 
diff --git a/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_dialog_cocoa.h b/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_dialog_cocoa.h
index 0c69720..4d9c9ef 100644
--- a/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_dialog_cocoa.h
+++ b/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_dialog_cocoa.h
@@ -46,7 +46,7 @@ class ProfileSigninConfirmationDialogCocoa : ConstrainedWindowMacDelegate {
 
  private:
   // ConstrainedWindowMacDelegate:
-  virtual void OnConstrainedWindowClosed(ConstrainedWindowMac* window) OVERRIDE;
+  virtual void OnConstrainedWindowClosed(ConstrainedWindowMac* window) override;
 
   // Controller for the dialog view.
   base::scoped_nsobject<ProfileSigninConfirmationViewController> controller_;
diff --git a/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller_browsertest.mm b/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller_browsertest.mm
index 9225419..7a26b4c 100644
--- a/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller_browsertest.mm
+++ b/chrome/browser/ui/cocoa/profiles/profile_signin_confirmation_view_controller_browsertest.mm
@@ -31,7 +31,7 @@ class ProfileSigninConfirmationViewControllerTest
   }
 
  protected:
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
   }
 
   void SetupDialog(bool offerProfileCreation = true) {
@@ -63,9 +63,9 @@ class ProfileSigninConfirmationViewControllerTest
   }
 
   // ui::ProfileSigninConfirmationDelegate:
-  virtual void OnContinueSignin() OVERRIDE { continued_ = true; }
-  virtual void OnCancelSignin() OVERRIDE { cancelled_ = true; }
-  virtual void OnSigninWithNewProfile() OVERRIDE { created_ = true; }
+  virtual void OnContinueSignin() override { continued_ = true; }
+  virtual void OnCancelSignin() override { cancelled_ = true; }
+  virtual void OnSigninWithNewProfile() override { created_ = true; }
   void OnClose() { closed_ = true; }
 
   // The window containing the dialog.
diff --git a/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm b/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm
index e19a9fd6..a3d6843 100644
--- a/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm
+++ b/chrome/browser/ui/cocoa/profiles/user_manager_mac.mm
@@ -35,7 +35,7 @@ class UserManagerWebContentsDelegate : public content::WebContentsDelegate {
   // to the current window.
   virtual void HandleKeyboardEvent(
       content::WebContents* source,
-      const content::NativeWebKeyboardEvent& event) OVERRIDE {
+      const content::NativeWebKeyboardEvent& event) override {
     if (![BrowserWindowUtils shouldHandleKeyboardEvent:event])
       return;
 
diff --git a/chrome/browser/ui/cocoa/profiles/user_manager_mac_unittest.mm b/chrome/browser/ui/cocoa/profiles/user_manager_mac_unittest.mm
index 9e988c2..c33c1e9 100644
--- a/chrome/browser/ui/cocoa/profiles/user_manager_mac_unittest.mm
+++ b/chrome/browser/ui/cocoa/profiles/user_manager_mac_unittest.mm
@@ -17,7 +17,7 @@ class UserManagerMacTest : public BrowserWithTestWindowTest {
       : testing_profile_manager_(TestingBrowserProcess::GetGlobal()) {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     BrowserWithTestWindowTest::SetUp();
     ASSERT_TRUE(testing_profile_manager_.SetUp());
     // Pre-load the guest profile so we don't have to wait for the User Manager
@@ -25,7 +25,7 @@ class UserManagerMacTest : public BrowserWithTestWindowTest {
     testing_profile_manager_.CreateGuestProfile();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     testing_profile_manager_.DeleteGuestProfile();
     TestingBrowserProcess::GetGlobal()->SetProfileManager(NULL);
     base::RunLoop().RunUntilIdle();
diff --git a/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.h b/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.h
index e5f5687..3fc318a 100644
--- a/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.h
+++ b/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.h
@@ -23,9 +23,9 @@ class RenderViewContextMenuMac : public RenderViewContextMenu {
   virtual ~RenderViewContextMenuMac();
 
   // SimpleMenuModel::Delegate implementation.
-  virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE;
-  virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
-  virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
+  virtual void ExecuteCommand(int command_id, int event_flags) override;
+  virtual bool IsCommandIdChecked(int command_id) const override;
+  virtual bool IsCommandIdEnabled(int command_id) const override;
 
   void Show();
 
@@ -33,8 +33,8 @@ class RenderViewContextMenuMac : public RenderViewContextMenu {
   // RenderViewContextMenu implementation.
   virtual bool GetAcceleratorForCommandId(
       int command_id,
-      ui::Accelerator* accelerator) OVERRIDE;
-  virtual void AppendPlatformEditableItems() OVERRIDE;
+      ui::Accelerator* accelerator) override;
+  virtual void AppendPlatformEditableItems() override;
 
  private:
   friend class ToolkitDelegateMac;
diff --git a/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.mm b/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.mm
index b7c38fe..de96f73 100644
--- a/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.mm
+++ b/chrome/browser/ui/cocoa/renderer_context_menu/render_view_context_menu_mac.mm
@@ -57,16 +57,16 @@ class ToolkitDelegateMac : public RenderViewContextMenuBase::ToolkitDelegate {
 
  private:
   // ToolkitDelegate:
-  virtual void Init(ui::SimpleMenuModel* menu_model) OVERRIDE {
+  virtual void Init(ui::SimpleMenuModel* menu_model) override {
     context_menu_->InitToolkitMenu();
   }
-  virtual void Cancel() OVERRIDE{
+  virtual void Cancel() override{
     context_menu_->CancelToolkitMenu();
   }
   virtual void UpdateMenuItem(int command_id,
                               bool enabled,
                               bool hidden,
-                              const base::string16& title) OVERRIDE {
+                              const base::string16& title) override {
     context_menu_->UpdateToolkitMenuItem(
         command_id, enabled, hidden, title);
   }
diff --git a/chrome/browser/ui/cocoa/screen_capture_notification_ui_cocoa.h b/chrome/browser/ui/cocoa/screen_capture_notification_ui_cocoa.h
index e096cea..c2286d2 100644
--- a/chrome/browser/ui/cocoa/screen_capture_notification_ui_cocoa.h
+++ b/chrome/browser/ui/cocoa/screen_capture_notification_ui_cocoa.h
@@ -36,7 +36,7 @@ class ScreenCaptureNotificationUICocoa : public ScreenCaptureNotificationUI {
 
   // ScreenCaptureNotificationUI interface.
   virtual gfx::NativeViewId OnStarted(const base::Closure& stop_callback)
-      OVERRIDE;
+      override;
 
  private:
   friend class ScreenCaptureNotificationUICocoaTest;
diff --git a/chrome/browser/ui/cocoa/screen_capture_notification_ui_cocoa_unittest.mm b/chrome/browser/ui/cocoa/screen_capture_notification_ui_cocoa_unittest.mm
index 005dcee..51bc168 100644
--- a/chrome/browser/ui/cocoa/screen_capture_notification_ui_cocoa_unittest.mm
+++ b/chrome/browser/ui/cocoa/screen_capture_notification_ui_cocoa_unittest.mm
@@ -29,7 +29,7 @@ class ScreenCaptureNotificationUICocoaTest : public CocoaTest {
       : callback_called_(0) {
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     callback_called_ = 0;
     target_.reset();
     EXPECT_EQ(0, callback_called_);
diff --git a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm
index 3b2fef9..3ae6eca 100644
--- a/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm
+++ b/chrome/browser/ui/cocoa/ssl_client_certificate_selector_cocoa.mm
@@ -49,13 +49,13 @@ class SSLClientAuthObserverCocoaBridge : public SSLClientAuthObserver,
   }
 
   // SSLClientAuthObserver implementation:
-  virtual void OnCertSelectedByNotification() OVERRIDE {
+  virtual void OnCertSelectedByNotification() override {
     [controller_ closeWebContentsModalDialog];
   }
 
   // ConstrainedWindowMacDelegate implementation:
   virtual void OnConstrainedWindowClosed(
-      ConstrainedWindowMac* window) OVERRIDE {
+      ConstrainedWindowMac* window) override {
     // |onConstrainedWindowClosed| will delete the sheet which might be still
     // in use higher up the call stack. Wait for the next cycle of the event
     // loop to call this function.
diff --git a/chrome/browser/ui/cocoa/status_bubble_mac.h b/chrome/browser/ui/cocoa/status_bubble_mac.h
index 9dbc7a2..20066e0 100644
--- a/chrome/browser/ui/cocoa/status_bubble_mac.h
+++ b/chrome/browser/ui/cocoa/status_bubble_mac.h
@@ -36,12 +36,12 @@ class StatusBubbleMac : public StatusBubble {
   virtual ~StatusBubbleMac();
 
   // StatusBubble implementation.
-  virtual void SetStatus(const base::string16& status) OVERRIDE;
-  virtual void SetURL(const GURL& url, const std::string& languages) OVERRIDE;
-  virtual void Hide() OVERRIDE;
+  virtual void SetStatus(const base::string16& status) override;
+  virtual void SetURL(const GURL& url, const std::string& languages) override;
+  virtual void Hide() override;
   virtual void MouseMoved(const gfx::Point& location,
-                          bool left_content) OVERRIDE;
-  virtual void UpdateDownloadShelfVisibility(bool visible) OVERRIDE;
+                          bool left_content) override;
+  virtual void UpdateDownloadShelfVisibility(bool visible) override;
 
   // Mac-specific method: Update the size and position of the status bubble to
   // match the parent window. Safe to call even when the status bubble does not
diff --git a/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm b/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm
index 1b60899..09c433b 100644
--- a/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm
+++ b/chrome/browser/ui/cocoa/status_bubble_mac_unittest.mm
@@ -76,10 +76,10 @@ class StatusBubbleMacIgnoreMouseMoved : public StatusBubbleMac {
 
   virtual void MouseMoved(
       const gfx::Point& location,
-      bool left_content) OVERRIDE {
+      bool left_content) override {
   }
 
-  virtual gfx::Point GetMouseLocation() OVERRIDE {
+  virtual gfx::Point GetMouseLocation() override {
     return mouseLocation_;
   }
 
diff --git a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h
index 87c2600..26350c4 100644
--- a/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h
+++ b/chrome/browser/ui/cocoa/status_icons/status_icon_mac.h
@@ -24,18 +24,18 @@ class StatusIconMac : public StatusIcon {
   virtual ~StatusIconMac();
 
   // Overridden from StatusIcon.
-  virtual void SetImage(const gfx::ImageSkia& image) OVERRIDE;
-  virtual void SetToolTip(const base::string16& tool_tip) OVERRIDE;
+  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;
+                              const base::string16& contents) override;
 
   bool HasStatusIconMenu();
 
  protected:
   // Overridden from StatusIcon.
   virtual void UpdatePlatformContextMenu(
-      StatusIconMenuModel* model) OVERRIDE;
+      StatusIconMenuModel* model) override;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(StatusIconMacTest, CreateMenu);
diff --git a/chrome/browser/ui/cocoa/status_icons/status_tray_mac.h b/chrome/browser/ui/cocoa/status_icons/status_tray_mac.h
index 7496892..375ab0f 100644
--- a/chrome/browser/ui/cocoa/status_icons/status_tray_mac.h
+++ b/chrome/browser/ui/cocoa/status_icons/status_tray_mac.h
@@ -17,7 +17,7 @@ class StatusTrayMac : public StatusTray {
   virtual StatusIcon* CreatePlatformStatusIcon(
       StatusIconType type,
       const gfx::ImageSkia& image,
-      const base::string16& tool_tip) OVERRIDE;
+      const base::string16& tool_tip) override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(StatusTrayMac);
diff --git a/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h b/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h
index ba128a3..5a59fdd 100644
--- a/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h
+++ b/chrome/browser/ui/cocoa/tab_contents/chrome_web_contents_view_delegate_mac.h
@@ -33,17 +33,17 @@ class ChromeWebContentsViewDelegateMac
   // Overridden from WebContentsViewDelegate:
   virtual NSObject<RenderWidgetHostViewMacDelegate>*
       CreateRenderWidgetHostViewDelegate(
-          content::RenderWidgetHost* render_widget_host) OVERRIDE;
-  virtual content::WebDragDestDelegate* GetDragDestDelegate() OVERRIDE;
+          content::RenderWidgetHost* render_widget_host) override;
+  virtual content::WebDragDestDelegate* GetDragDestDelegate() override;
   virtual void ShowContextMenu(
       content::RenderFrameHost* render_frame_host,
-      const content::ContextMenuParams& params) OVERRIDE;
+      const content::ContextMenuParams& params) override;
 
   // Overridden from ContextMenuDelegate.
   virtual scoped_ptr<RenderViewContextMenu> BuildMenu(
       content::WebContents* web_contents,
-      const content::ContextMenuParams& params) OVERRIDE;
-  virtual void ShowMenu(scoped_ptr<RenderViewContextMenu> menu) OVERRIDE;
+      const content::ContextMenuParams& params) override;
+  virtual void ShowMenu(scoped_ptr<RenderViewContextMenu> menu) override;
 
  private:
   content::RenderWidgetHostView* GetActiveRenderWidgetHostView();
diff --git a/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h b/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h
index 836e225..6d5b223 100644
--- a/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h
+++ b/chrome/browser/ui/cocoa/tab_contents/instant_overlay_controller_mac.h
@@ -20,7 +20,7 @@ class InstantOverlayControllerMac : public InstantOverlayController {
 
  private:
   // Overridden from InstantOverlayController:
-  virtual void OverlayStateChanged(const InstantOverlayModel& model) OVERRIDE;
+  virtual void OverlayStateChanged(const InstantOverlayModel& model) override;
 
   OverlayableContentsController* const overlay_;
 
diff --git a/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h b/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h
index 91fc745..ef01d2b 100644
--- a/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h
+++ b/chrome/browser/ui/cocoa/tab_contents/sad_tab_controller.h
@@ -24,8 +24,8 @@ class SadTabCocoa : public SadTab {
 
  private:
   // Overridden from SadTab:
-  virtual void Show() OVERRIDE;
-  virtual void Close() OVERRIDE;
+  virtual void Show() override;
+  virtual void Close() override;
 
   base::scoped_nsobject<SadTabController> sad_tab_controller_;
 
diff --git a/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm b/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm
index d50a5b5..a54c6ac 100644
--- a/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm
+++ b/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm
@@ -43,15 +43,15 @@ class FullscreenObserver : public WebContentsObserver {
     return WebContentsObserver::web_contents();
   }
 
-  virtual void DidShowFullscreenWidget(int routing_id) OVERRIDE {
+  virtual void DidShowFullscreenWidget(int routing_id) override {
     [controller_ toggleFullscreenWidget:YES];
   }
 
-  virtual void DidDestroyFullscreenWidget(int routing_id) OVERRIDE {
+  virtual void DidDestroyFullscreenWidget(int routing_id) override {
     [controller_ toggleFullscreenWidget:NO];
   }
 
-  virtual void DidToggleFullscreenModeForTab(bool entered_fullscreen) OVERRIDE {
+  virtual void DidToggleFullscreenModeForTab(bool entered_fullscreen) override {
     [controller_ toggleFullscreenWidget:YES];
   }
 
diff --git a/chrome/browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.h b/chrome/browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.h
index 28a143d..3dc413c 100644
--- a/chrome/browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.h
+++ b/chrome/browser/ui/cocoa/tab_contents/web_drag_bookmark_handler_mac.h
@@ -23,11 +23,11 @@ class WebDragBookmarkHandlerMac : public content::WebDragDestDelegate {
   virtual ~WebDragBookmarkHandlerMac();
 
   // Overridden from content::WebDragDestDelegate:
-  virtual void DragInitialize(content::WebContents* contents) OVERRIDE;
-  virtual void OnDragOver() OVERRIDE;
-  virtual void OnDragEnter() OVERRIDE;
-  virtual void OnDrop() OVERRIDE;
-  virtual void OnDragLeave() OVERRIDE;
+  virtual void DragInitialize(content::WebContents* contents) override;
+  virtual void OnDragOver() override;
+  virtual void OnDragEnter() override;
+  virtual void OnDrop() override;
+  virtual void OnDragLeave() override;
 
  private:
   // The BookmarkTabHelper.
diff --git a/chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.h b/chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.h
index 4ef6fc4..440bc5a 100644
--- a/chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.h
+++ b/chrome/browser/ui/cocoa/tab_modal_confirm_dialog_mac.h
@@ -35,15 +35,15 @@ class TabModalConfirmDialogMac : public TabModalConfirmDialog,
   virtual ~TabModalConfirmDialogMac();
 
   // TabModalConfirmDialog:
-  virtual void AcceptTabModalDialog() OVERRIDE;
-  virtual void CancelTabModalDialog() OVERRIDE;
+  virtual void AcceptTabModalDialog() override;
+  virtual void CancelTabModalDialog() override;
 
   // TabModalConfirmDialogCloseDelegate:
-  virtual void CloseDialog() OVERRIDE;
+  virtual void CloseDialog() override;
 
   // ConstrainedWindowMacDelegate:
   virtual void OnConstrainedWindowClosed(
-      ConstrainedWindowMac* window) OVERRIDE;
+      ConstrainedWindowMac* window) override;
 
   bool closing_;
 
diff --git a/chrome/browser/ui/cocoa/table_row_nsimage_cache_unittest.mm b/chrome/browser/ui/cocoa/table_row_nsimage_cache_unittest.mm
index 4f7cc19..31943ec 100644
--- a/chrome/browser/ui/cocoa/table_row_nsimage_cache_unittest.mm
+++ b/chrome/browser/ui/cocoa/table_row_nsimage_cache_unittest.mm
@@ -18,10 +18,10 @@ class TestTable : public TableRowNSImageCache::Table {
   }
 
   // TableRowNSImageCache::Table overrides.
-  virtual int RowCount() const OVERRIDE {
+  virtual int RowCount() const override {
     return rows_.size();
   }
-  virtual gfx::ImageSkia GetIcon(int index) const OVERRIDE {
+  virtual gfx::ImageSkia GetIcon(int index) const override {
     return gfx::ImageSkia::CreateFrom1xBitmap(rows_[index]);
   }
 
diff --git a/chrome/browser/ui/cocoa/tabs/media_indicator_view.mm b/chrome/browser/ui/cocoa/tabs/media_indicator_view.mm
index 0e67c80..2711a79 100644
--- a/chrome/browser/ui/cocoa/tabs/media_indicator_view.mm
+++ b/chrome/browser/ui/cocoa/tabs/media_indicator_view.mm
@@ -23,15 +23,15 @@ class MediaIndicatorViewAnimationDelegate : public gfx::AnimationDelegate {
     doneCallbackSelector_ = selector;
   }
 
-  virtual void AnimationEnded(const gfx::Animation* animation) OVERRIDE {
+  virtual void AnimationEnded(const gfx::Animation* animation) override {
     *animatingMediaState_ = *mediaState_;
     [view_ setNeedsDisplay:YES];
     [doneCallbackObject_ performSelector:doneCallbackSelector_];
   }
-  virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE {
+  virtual void AnimationProgressed(const gfx::Animation* animation) override {
     [view_ setNeedsDisplay:YES];
   }
-  virtual void AnimationCanceled(const gfx::Animation* animation) OVERRIDE {
+  virtual void AnimationCanceled(const gfx::Animation* animation) override {
     AnimationEnded(animation);
   }
 
diff --git a/chrome/browser/ui/cocoa/tabs/tab_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_controller.mm
index c7ab223..73a667b 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_controller.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_controller.mm
@@ -42,18 +42,18 @@ class MenuDelegate : public ui::SimpleMenuModel::Delegate {
         owner_(owner) {}
 
   // Overridden from ui::SimpleMenuModel::Delegate
-  virtual bool IsCommandIdChecked(int command_id) const OVERRIDE {
+  virtual bool IsCommandIdChecked(int command_id) const override {
     return false;
   }
-  virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE {
+  virtual bool IsCommandIdEnabled(int command_id) const override {
     TabStripModel::ContextMenuCommand command =
         static_cast<TabStripModel::ContextMenuCommand>(command_id);
     return [target_ isCommandEnabled:command forController:owner_];
   }
   virtual bool GetAcceleratorForCommandId(
       int command_id,
-      ui::Accelerator* accelerator) OVERRIDE { return false; }
-  virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE {
+      ui::Accelerator* accelerator) override { return false; }
+  virtual void ExecuteCommand(int command_id, int event_flags) override {
     TabStripModel::ContextMenuCommand command =
         static_cast<TabStripModel::ContextMenuCommand>(command_id);
     [target_ commandDispatch:command forController:owner_];
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm
index 69c17b2..4ee3439 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller_unittest.mm
@@ -89,7 +89,7 @@ namespace {
 
 class TabStripControllerTest : public CocoaProfileTest {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(browser());
 
@@ -127,7 +127,7 @@ class TabStripControllerTest : public CocoaProfileTest {
                           delegate:controller_delegate_.get()]);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // The call to CocoaTest::TearDown() deletes the Browser and TabStripModel
     // objects, so we first have to delete the controller, which refers to them.
     controller_.reset();
diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h b/chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h
index 1243351..20a0315 100644
--- a/chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h
+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_model_observer_bridge.h
@@ -29,34 +29,34 @@ class TabStripModelObserverBridge : public TabStripModelObserver {
   // Overridden from TabStripModelObserver
   virtual void TabInsertedAt(content::WebContents* contents,
                              int index,
-                             bool foreground) OVERRIDE;
+                             bool foreground) override;
   virtual void TabClosingAt(TabStripModel* tab_strip_model,
                             content::WebContents* contents,
-                            int index) OVERRIDE;
+                            int index) override;
   virtual void TabDetachedAt(content::WebContents* contents,
-                             int index) OVERRIDE;
-  virtual void TabDeactivated(content::WebContents* contents) OVERRIDE;
+                             int index) override;
+  virtual void TabDeactivated(content::WebContents* contents) override;
   virtual void ActiveTabChanged(content::WebContents* old_contents,
                                 content::WebContents* new_contents,
                                 int index,
-                                int reason) OVERRIDE;
+                                int reason) override;
   virtual void TabSelectionChanged(
       TabStripModel* tab_strip_model,
-      const ui::ListSelectionModel& old_model) OVERRIDE;
+      const ui::ListSelectionModel& old_model) override;
   virtual void TabMoved(content::WebContents* contents,
                         int from_index,
-                        int to_index) OVERRIDE;
+                        int to_index) override;
   virtual void TabChangedAt(content::WebContents* contents,
                             int index,
-                            TabChangeType change_type) OVERRIDE;
+                            TabChangeType change_type) override;
   virtual void TabReplacedAt(TabStripModel* tab_strip_model,
                              content::WebContents* old_contents,
                              content::WebContents* new_contents,
-                             int index) OVERRIDE;
+                             int index) override;
   virtual void TabMiniStateChanged(content::WebContents* contents,
-                                   int index) OVERRIDE;
-  virtual void TabStripEmpty() OVERRIDE;
-  virtual void TabStripModelDeleted() OVERRIDE;
+                                   int index) override;
+  virtual void TabStripEmpty() override;
+  virtual void TabStripModelDeleted() override;
 
  private:
   id controller_;  // weak, owns me
diff --git a/chrome/browser/ui/cocoa/task_manager_mac.h b/chrome/browser/ui/cocoa/task_manager_mac.h
index 093f9f4..f710595 100644
--- a/chrome/browser/ui/cocoa/task_manager_mac.h
+++ b/chrome/browser/ui/cocoa/task_manager_mac.h
@@ -70,18 +70,18 @@ class TaskManagerMac : public TaskManagerModelObserver,
   virtual ~TaskManagerMac();
 
   // TaskManagerModelObserver
-  virtual void OnModelChanged() OVERRIDE;
-  virtual void OnItemsChanged(int start, int length) OVERRIDE;
-  virtual void OnItemsAdded(int start, int length) OVERRIDE;
-  virtual void OnItemsRemoved(int start, int length) OVERRIDE;
+  virtual void OnModelChanged() override;
+  virtual void OnItemsChanged(int start, int length) override;
+  virtual void OnItemsAdded(int start, int length) override;
+  virtual void OnItemsRemoved(int start, int length) override;
 
   // Called by the cocoa window controller when its window closes and the
   // controller destroyed itself. Informs the model to stop updating.
   void WindowWasClosed();
 
   // TableRowNSImageCache::Table
-  virtual int RowCount() const OVERRIDE;
-  virtual gfx::ImageSkia GetIcon(int r) const OVERRIDE;
+  virtual int RowCount() const override;
+  virtual gfx::ImageSkia GetIcon(int r) const override;
 
   // Creates the task manager if it doesn't exist; otherwise, it activates the
   // existing task manager window.
diff --git a/chrome/browser/ui/cocoa/task_manager_mac_unittest.mm b/chrome/browser/ui/cocoa/task_manager_mac_unittest.mm
index e9a88fc..590cf87 100644
--- a/chrome/browser/ui/cocoa/task_manager_mac_unittest.mm
+++ b/chrome/browser/ui/cocoa/task_manager_mac_unittest.mm
@@ -21,21 +21,21 @@ class TestResource : public task_manager::Resource {
  public:
   TestResource(const base::string16& title, pid_t pid)
       : title_(title), pid_(pid) {}
-  virtual base::string16 GetTitle() const OVERRIDE { return title_; }
-  virtual base::string16 GetProfileName() const OVERRIDE {
+  virtual base::string16 GetTitle() const override { return title_; }
+  virtual base::string16 GetProfileName() const override {
     return base::string16();
   }
-  virtual gfx::ImageSkia GetIcon() const OVERRIDE { return gfx::ImageSkia(); }
-  virtual base::ProcessHandle GetProcess() const OVERRIDE { return pid_; }
-  virtual int GetUniqueChildProcessId() const OVERRIDE {
+  virtual gfx::ImageSkia GetIcon() const override { return gfx::ImageSkia(); }
+  virtual base::ProcessHandle GetProcess() const override { return pid_; }
+  virtual int GetUniqueChildProcessId() const override {
     // In reality the unique child process ID is not the actual process ID,
     // but for testing purposes it shouldn't make difference.
     return static_cast<int>(base::GetCurrentProcId());
   }
-  virtual Type GetType() const OVERRIDE { return RENDERER; }
-  virtual bool SupportNetworkUsage() const OVERRIDE { return false; }
-  virtual void SetSupportNetworkUsage() OVERRIDE { NOTREACHED(); }
-  virtual void Refresh() OVERRIDE {}
+  virtual Type GetType() const override { return RENDERER; }
+  virtual bool SupportNetworkUsage() const override { return false; }
+  virtual void SetSupportNetworkUsage() override { NOTREACHED(); }
+  virtual void Refresh() override {}
   base::string16 title_;
   base::string16 profile_name_;
   pid_t pid_;
diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
index a7de9f2..0dd797a 100644
--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.mm
@@ -117,7 +117,7 @@ class NotificationBridge : public WrenchMenuBadgeController::Delegate {
 
   virtual void UpdateBadgeSeverity(WrenchMenuBadgeController::BadgeType type,
                                    WrenchIconPainter::Severity severity,
-                                   bool animate) OVERRIDE {
+                                   bool animate) override {
     [controller_ updateWrenchButtonSeverity:severity animate:animate];
   }
 
diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm b/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm
index 878c4f0..520618c 100644
--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm
@@ -51,7 +51,7 @@ class ToolbarControllerTest : public CocoaProfileTest {
     kWrenchIndex, kLocationIndex, kBrowserActionContainerViewIndex
   };
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(browser());
 
@@ -73,7 +73,7 @@ class ToolbarControllerTest : public CocoaProfileTest {
     [parent addSubview:[bar_ view]];
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     bar_.reset();  // browser() must outlive the ToolbarController.
     CocoaProfileTest::TearDown();
   }
diff --git a/chrome/browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.mm b/chrome/browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.mm
index 8425bff..adae572 100644
--- a/chrome/browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.mm
+++ b/chrome/browser/ui/cocoa/toolbar/wrench_toolbar_button_cell.mm
@@ -13,7 +13,7 @@ class WrenchIconPainterDelegateMac : public WrenchIconPainter::Delegate {
   explicit WrenchIconPainterDelegateMac(NSCell* cell) : cell_(cell) {}
   virtual ~WrenchIconPainterDelegateMac() {}
 
-  virtual void ScheduleWrenchIconPaint() OVERRIDE {
+  virtual void ScheduleWrenchIconPaint() override {
     [[cell_ controlView] setNeedsDisplay:YES];
   }
 
diff --git a/chrome/browser/ui/cocoa/translate/translate_bubble_controller.mm b/chrome/browser/ui/cocoa/translate/translate_bubble_controller.mm
index 87e3f5e..0f1e81a 100644
--- a/chrome/browser/ui/cocoa/translate/translate_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/translate/translate_bubble_controller.mm
@@ -46,16 +46,16 @@ class TranslateDenialComboboxModel : public ui::ComboboxModel {
 
  private:
   // ComboboxModel:
-  virtual int GetItemCount() const OVERRIDE {
+  virtual int GetItemCount() const override {
     return items_.size();
   }
-  virtual base::string16 GetItemAt(int index) OVERRIDE {
+  virtual base::string16 GetItemAt(int index) override {
     return items_[index];
   }
-  virtual bool IsItemSeparatorAt(int index) OVERRIDE {
+  virtual bool IsItemSeparatorAt(int index) override {
     return false;
   }
-  virtual int GetDefaultIndex() const OVERRIDE {
+  virtual int GetDefaultIndex() const override {
     return 0;
   }
 
diff --git a/chrome/browser/ui/cocoa/translate/translate_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/translate/translate_bubble_controller_unittest.mm
index ccc1d5d..7bdd68f 100644
--- a/chrome/browser/ui/cocoa/translate/translate_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/translate/translate_bubble_controller_unittest.mm
@@ -24,7 +24,7 @@
 
 class TranslateBubbleControllerTest : public CocoaProfileTest {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaProfileTest::SetUp();
     site_instance_ = content::SiteInstance::Create(profile());
   }
diff --git a/chrome/browser/ui/cocoa/validation_message_bubble_cocoa.mm b/chrome/browser/ui/cocoa/validation_message_bubble_cocoa.mm
index 9612eaec..38dc78d 100644
--- a/chrome/browser/ui/cocoa/validation_message_bubble_cocoa.mm
+++ b/chrome/browser/ui/cocoa/validation_message_bubble_cocoa.mm
@@ -168,7 +168,7 @@ class ValidationMessageBubbleCocoa : public chrome::ValidationMessageBubble {
 
   virtual void SetPositionRelativeToAnchor(
       content::RenderWidgetHost* widget_host,
-      const gfx::Rect& anchor_in_root_view) OVERRIDE {
+      const gfx::Rect& anchor_in_root_view) override {
     [controller_.get()
         setAnchorPoint:GetAnchorPoint(widget_host, anchor_in_root_view)];
   }
diff --git a/chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_cocoa.mm b/chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_cocoa.mm
index f284c5b..6c8fc34 100644
--- a/chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_cocoa.mm
+++ b/chrome/browser/ui/cocoa/web_contents_modal_dialog_manager_cocoa.mm
@@ -23,30 +23,30 @@ class NativeWebContentsModalDialogManagerCocoa
   }
 
   // SingleWebContentsDialogManager overrides
-  virtual void Show() OVERRIDE {
+  virtual void Show() override {
     GetConstrainedWindowMac(dialog())->ShowWebContentsModalDialog();
   }
 
-  virtual void Hide() OVERRIDE {
+  virtual void Hide() override {
   }
 
-  virtual void Close() OVERRIDE {
+  virtual void Close() override {
     GetConstrainedWindowMac(dialog())->CloseWebContentsModalDialog();
   }
 
-  virtual void Focus() OVERRIDE {
+  virtual void Focus() override {
     GetConstrainedWindowMac(dialog())->FocusWebContentsModalDialog();
   }
 
-  virtual void Pulse() OVERRIDE {
+  virtual void Pulse() override {
     GetConstrainedWindowMac(dialog())->PulseWebContentsModalDialog();
   }
 
   virtual void HostChanged(
-      web_modal::WebContentsModalDialogHost* new_host) OVERRIDE {
+      web_modal::WebContentsModalDialogHost* new_host) override {
   }
 
-  virtual NativeWebContentsModalDialog dialog() OVERRIDE {
+  virtual NativeWebContentsModalDialog dialog() override {
     return dialog_;
   }
 
diff --git a/chrome/browser/ui/cocoa/web_dialog_window_controller.mm b/chrome/browser/ui/cocoa/web_dialog_window_controller.mm
index fd83849..111212a 100644
--- a/chrome/browser/ui/cocoa/web_dialog_window_controller.mm
+++ b/chrome/browser/ui/cocoa/web_dialog_window_controller.mm
@@ -44,36 +44,36 @@ public:
   void WindowControllerClosed();
 
   // WebDialogDelegate declarations.
-  virtual ui::ModalType GetDialogModalType() const OVERRIDE;
-  virtual base::string16 GetDialogTitle() const OVERRIDE;
-  virtual GURL GetDialogContentURL() const OVERRIDE;
+  virtual ui::ModalType GetDialogModalType() const override;
+  virtual base::string16 GetDialogTitle() const override;
+  virtual GURL GetDialogContentURL() const override;
   virtual void GetWebUIMessageHandlers(
-      std::vector<WebUIMessageHandler*>* handlers) const OVERRIDE;
-  virtual void GetDialogSize(gfx::Size* size) const OVERRIDE;
-  virtual void GetMinimumDialogSize(gfx::Size* size) const OVERRIDE;
-  virtual std::string GetDialogArgs() const OVERRIDE;
-  virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE;
+      std::vector<WebUIMessageHandler*>* handlers) const override;
+  virtual void GetDialogSize(gfx::Size* size) const override;
+  virtual void GetMinimumDialogSize(gfx::Size* size) const override;
+  virtual std::string GetDialogArgs() const override;
+  virtual void OnDialogClosed(const std::string& json_retval) override;
   virtual void OnCloseContents(WebContents* source,
-                               bool* out_close_dialog) OVERRIDE;
-  virtual bool ShouldShowDialogTitle() const OVERRIDE { return true; }
+                               bool* out_close_dialog) override;
+  virtual bool ShouldShowDialogTitle() const override { return true; }
 
   // WebDialogWebContentsDelegate declarations.
-  virtual void MoveContents(WebContents* source, const gfx::Rect& pos) OVERRIDE;
+  virtual void MoveContents(WebContents* source, const gfx::Rect& pos) override;
   virtual void HandleKeyboardEvent(
       content::WebContents* source,
-      const NativeWebKeyboardEvent& event) OVERRIDE;
-  virtual void CloseContents(WebContents* source) OVERRIDE;
+      const NativeWebKeyboardEvent& event) override;
+  virtual void CloseContents(WebContents* source) override;
   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 void LoadingStateChanged(content::WebContents* source,
-                                   bool to_different_document) OVERRIDE;
+                                   bool to_different_document) override;
 
 private:
   WebDialogWindowController* controller_;  // weak
diff --git a/chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h b/chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h
index c770d4e..5cb4afd 100644
--- a/chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h
+++ b/chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h
@@ -25,11 +25,11 @@ class PermissionBubbleCocoa : public PermissionBubbleView {
   // PermissionBubbleView interface.
   virtual void Show(const std::vector<PermissionBubbleRequest*>& requests,
                     const std::vector<bool>& accept_state,
-                    bool customization_mode) OVERRIDE;
-  virtual void Hide() OVERRIDE;
-  virtual bool IsVisible() OVERRIDE;
-  virtual void SetDelegate(Delegate* delegate) OVERRIDE;
-  virtual bool CanAcceptRequestUpdate() OVERRIDE;
+                    bool customization_mode) override;
+  virtual void Hide() override;
+  virtual bool IsVisible() override;
+  virtual void SetDelegate(Delegate* delegate) override;
+  virtual bool CanAcceptRequestUpdate() override;
 
   // Called when |bubbleController_| is closing.
   void OnBubbleClosing();
diff --git a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm
index 33b51a3..55d029b 100644
--- a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm
+++ b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.mm
@@ -53,18 +53,18 @@ class MenuDelegate : public ui::SimpleMenuModel::Delegate {
  public:
   explicit MenuDelegate(PermissionBubbleController* bubble)
       : bubble_controller_(bubble) {}
-  virtual bool IsCommandIdChecked(int command_id) const OVERRIDE {
+  virtual bool IsCommandIdChecked(int command_id) const override {
     return false;
   }
-  virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE {
+  virtual bool IsCommandIdEnabled(int command_id) const override {
     return true;
   }
   virtual bool GetAcceleratorForCommandId(
       int command_id,
-      ui::Accelerator* accelerator) OVERRIDE {
+      ui::Accelerator* accelerator) override {
     return false;
   }
-  virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE {
+  virtual void ExecuteCommand(int command_id, int event_flags) override {
     [bubble_controller_ onMenuItemClicked:command_id];
   }
  private:
diff --git a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm
index b2eaaab..4642c1b 100644
--- a/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm
@@ -50,7 +50,7 @@ class PermissionBubbleControllerTest : public CocoaTest,
   MOCK_METHOD0(Closing, void());
   MOCK_METHOD1(SetView, void(PermissionBubbleView*));
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaTest::SetUp();
     bridge_.reset(new PermissionBubbleCocoa(nil));
     AddRequest(kPermissionA);
@@ -59,7 +59,7 @@ class PermissionBubbleControllerTest : public CocoaTest,
                       bridge:bridge_.get()];
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     [controller_ close];
     chrome::testing::NSRunLoopRunAllPending();
     STLDeleteElements(&requests_);
diff --git a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h
index b9c391b..cce6482 100644
--- a/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h
+++ b/chrome/browser/ui/cocoa/website_settings/website_settings_bubble_controller.h
@@ -118,12 +118,12 @@ class WebsiteSettingsUIBridge : public WebsiteSettingsUI {
       WebsiteSettingsBubbleController* bubble_controller);
 
   // WebsiteSettingsUI implementations.
-  virtual void SetCookieInfo(const CookieInfoList& cookie_info_list) OVERRIDE;
+  virtual void SetCookieInfo(const CookieInfoList& cookie_info_list) override;
   virtual void SetPermissionInfo(
-      const PermissionInfoList& permission_info_list) OVERRIDE;
-  virtual void SetIdentityInfo(const IdentityInfo& identity_info) OVERRIDE;
-  virtual void SetFirstVisit(const base::string16& first_visit) OVERRIDE;
-  virtual void SetSelectedTab(TabId tab_id) OVERRIDE;
+      const PermissionInfoList& permission_info_list) override;
+  virtual void SetIdentityInfo(const IdentityInfo& identity_info) override;
+  virtual void SetFirstVisit(const base::string16& first_visit) override;
+  virtual void SetSelectedTab(TabId tab_id) override;
 
  private:
   // The Cocoa controller for the bubble UI.
diff --git a/chrome/browser/ui/cocoa/wrench_menu/recent_tabs_menu_model_delegate.h b/chrome/browser/ui/cocoa/wrench_menu/recent_tabs_menu_model_delegate.h
index d9cdd60..471cccd 100644
--- a/chrome/browser/ui/cocoa/wrench_menu/recent_tabs_menu_model_delegate.h
+++ b/chrome/browser/ui/cocoa/wrench_menu/recent_tabs_menu_model_delegate.h
@@ -22,7 +22,7 @@ class RecentTabsMenuModelDelegate : public ui::MenuModelDelegate {
   virtual ~RecentTabsMenuModelDelegate();
 
   // ui::MenuModelDelegate:
-  virtual void OnIconChanged(int index) OVERRIDE;
+  virtual void OnIconChanged(int index) override;
 
  private:
   ui::MenuModel* model_;  // weak
diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm
index 661e5e4..659e5b6 100644
--- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm
+++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm
@@ -54,7 +54,7 @@ namespace WrenchMenuControllerInternal {
 class AcceleratorDelegate : public ui::AcceleratorProvider {
  public:
   virtual bool GetAcceleratorForCommandId(int command_id,
-      ui::Accelerator* out_accelerator) OVERRIDE {
+      ui::Accelerator* out_accelerator) override {
     AcceleratorsCocoa* keymap = AcceleratorsCocoa::GetInstance();
     const ui::Accelerator* accelerator =
         keymap->GetAcceleratorForCommand(command_id);
diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
index 26b18a1..6b198fa 100644
--- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller_unittest.mm
@@ -52,8 +52,8 @@ class DummyRouter : public browser_sync::LocalSessionEventRouter {
  public:
   virtual ~DummyRouter() {}
   virtual void StartRoutingTo(
-      browser_sync::LocalSessionEventHandler* handler) OVERRIDE {}
-  virtual void Stop() OVERRIDE {}
+      browser_sync::LocalSessionEventHandler* handler) override {}
+  virtual void Stop() override {}
 };
 
 class WrenchMenuControllerTest
@@ -71,7 +71,7 @@ class WrenchMenuControllerTest
 
   virtual ~WrenchMenuControllerTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(browser());
 
@@ -100,7 +100,7 @@ class WrenchMenuControllerTest
     return manager_.get();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     fake_model_.reset();
     controller_.reset();
     manager_.reset();
diff --git a/chrome/browser/ui/collected_cookies_infobar_delegate.h b/chrome/browser/ui/collected_cookies_infobar_delegate.h
index 150f6ac..4eed88c 100644
--- a/chrome/browser/ui/collected_cookies_infobar_delegate.h
+++ b/chrome/browser/ui/collected_cookies_infobar_delegate.h
@@ -25,12 +25,12 @@ class CollectedCookiesInfoBarDelegate : public ConfirmInfoBarDelegate {
   virtual ~CollectedCookiesInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
-  virtual int GetIconID() const OVERRIDE;
-  virtual Type GetInfoBarType() const OVERRIDE;
-  virtual base::string16 GetMessageText() const OVERRIDE;
-  virtual int GetButtons() const OVERRIDE;
-  virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
-  virtual bool Accept() OVERRIDE;
+  virtual int GetIconID() const override;
+  virtual Type GetInfoBarType() const override;
+  virtual base::string16 GetMessageText() const override;
+  virtual int GetButtons() const override;
+  virtual base::string16 GetButtonLabel(InfoBarButton button) const override;
+  virtual bool Accept() override;
 
   DISALLOW_COPY_AND_ASSIGN(CollectedCookiesInfoBarDelegate);
 };
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
index 5ae6f1b..0a7163c 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc
@@ -183,7 +183,7 @@ class ContentSettingTitleLinkAndCustomModel
 
  private:
   void SetCustomLink();
-  virtual void OnCustomLinkClicked() OVERRIDE {}
+  virtual void OnCustomLinkClicked() override {}
 };
 
 ContentSettingTitleLinkAndCustomModel::ContentSettingTitleLinkAndCustomModel(
@@ -224,7 +224,7 @@ class ContentSettingSingleRadioGroup
  private:
   void SetRadioGroup();
   void AddException(ContentSetting setting);
-  virtual void OnRadioClicked(int radio_index) OVERRIDE;
+  virtual void OnRadioClicked(int radio_index) override;
 
   ContentSetting block_setting_;
   int selected_item_;
@@ -413,7 +413,7 @@ class ContentSettingCookiesBubbleModel : public ContentSettingSingleRadioGroup {
   virtual ~ContentSettingCookiesBubbleModel();
 
  private:
-  virtual void OnCustomLinkClicked() OVERRIDE;
+  virtual void OnCustomLinkClicked() override;
 };
 
 ContentSettingCookiesBubbleModel::ContentSettingCookiesBubbleModel(
@@ -457,7 +457,7 @@ class ContentSettingPluginBubbleModel : public ContentSettingSingleRadioGroup {
   virtual ~ContentSettingPluginBubbleModel();
 
  private:
-  virtual void OnCustomLinkClicked() OVERRIDE;
+  virtual void OnCustomLinkClicked() override;
 };
 
 ContentSettingPluginBubbleModel::ContentSettingPluginBubbleModel(
@@ -508,7 +508,7 @@ class ContentSettingPopupBubbleModel : public ContentSettingSingleRadioGroup {
 
  private:
   void SetPopups();
-  virtual void OnPopupClicked(int index) OVERRIDE;
+  virtual void OnPopupClicked(int index) override;
 };
 
 ContentSettingPopupBubbleModel::ContentSettingPopupBubbleModel(
@@ -574,9 +574,9 @@ class ContentSettingMediaStreamBubbleModel
                                   const std::string& device);
 
   // ContentSettingBubbleModel implementation.
-  virtual void OnRadioClicked(int radio_index) OVERRIDE;
+  virtual void OnRadioClicked(int radio_index) override;
   virtual void OnMediaMenuClicked(content::MediaStreamType type,
-                                  const std::string& selected_device) OVERRIDE;
+                                  const std::string& selected_device) override;
 
   // The index of the selected radio item.
   int selected_item_;
@@ -866,7 +866,7 @@ class ContentSettingDomainListBubbleModel
  private:
   void MaybeAddDomainList(const std::set<std::string>& hosts, int title_id);
   void SetDomainsAndCustomLink();
-  virtual void OnCustomLinkClicked() OVERRIDE;
+  virtual void OnCustomLinkClicked() override;
 };
 
 ContentSettingDomainListBubbleModel::ContentSettingDomainListBubbleModel(
@@ -953,7 +953,7 @@ class ContentSettingMixedScriptBubbleModel
   virtual ~ContentSettingMixedScriptBubbleModel() {}
 
  private:
-  virtual void OnCustomLinkClicked() OVERRIDE;
+  virtual void OnCustomLinkClicked() override;
 };
 
 ContentSettingMixedScriptBubbleModel::ContentSettingMixedScriptBubbleModel(
@@ -1119,7 +1119,7 @@ class ContentSettingMidiSysExBubbleModel
  private:
   void MaybeAddDomainList(const std::set<std::string>& hosts, int title_id);
   void SetDomainsAndCustomLink();
-  virtual void OnCustomLinkClicked() OVERRIDE;
+  virtual void OnCustomLinkClicked() override;
 };
 
 ContentSettingMidiSysExBubbleModel::ContentSettingMidiSysExBubbleModel(
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.h b/chrome/browser/ui/content_settings/content_setting_bubble_model.h
index 4d1573d..dbc3f71 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.h
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.h
@@ -108,7 +108,7 @@ class ContentSettingBubbleModel : public content::NotificationObserver {
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   virtual void OnRadioClicked(int radio_index) {}
   virtual void OnPopupClicked(int index) {}
@@ -198,8 +198,8 @@ class ContentSettingTitleAndLinkModel : public ContentSettingBubbleModel {
   void SetLearnMoreLink();
 
   // content::ContentSettingBubbleModel:
-  virtual void OnManageLinkClicked() OVERRIDE;
-  virtual void OnLearnMoreLinkClicked() OVERRIDE;
+  virtual void OnManageLinkClicked() override;
+  virtual void OnLearnMoreLinkClicked() override;
   Delegate* delegate_;
 };
 
@@ -211,8 +211,8 @@ class ContentSettingRPHBubbleModel : public ContentSettingTitleAndLinkModel {
                                ProtocolHandlerRegistry* registry,
                                ContentSettingsType content_type);
 
-  virtual void OnRadioClicked(int radio_index) OVERRIDE;
-  virtual void OnDoneClicked() OVERRIDE;
+  virtual void OnRadioClicked(int radio_index) override;
+  virtual void OnDoneClicked() override;
 
  private:
   // These states must match the order of appearance of the radio buttons
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc
index dfe2b76..54953e1 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_browsertest.cc
@@ -22,7 +22,7 @@ const base::FilePath::CharType kDocRoot[] =
 
 class ContentSettingBubbleModelMixedScriptTest : public InProcessBrowserTest {
  protected:
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+  virtual void SetUpInProcessBrowserTestFixture() override {
     https_server_.reset(
         new net::SpawnedTestServer(
             net::SpawnedTestServer::TYPE_HTTPS,
diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
index c10b863..3df205d 100644
--- a/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model_unittest.cc
@@ -28,7 +28,7 @@ using content::WebContentsTester;
 
 class ContentSettingBubbleModelTest : public ChromeRenderViewHostTestHarness {
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
     TabSpecificContentSettings::CreateForWebContents(web_contents());
     InfoBarService::CreateForWebContents(web_contents());
@@ -814,7 +814,7 @@ TEST_F(ContentSettingBubbleModelTest, RegisterProtocolHandler) {
 
 class FakeDelegate : public ProtocolHandlerRegistry::Delegate {
  public:
-  virtual void RegisterExternalHandler(const std::string& protocol) OVERRIDE {
+  virtual void RegisterExternalHandler(const std::string& protocol) override {
     // Overrides in order to not register the handler with the
     // ChildProcessSecurityPolicy. That has persistent and unalterable
     // side effects on other tests.
@@ -822,19 +822,19 @@ class FakeDelegate : public ProtocolHandlerRegistry::Delegate {
 
   virtual ShellIntegration::DefaultProtocolClientWorker* CreateShellWorker(
       ShellIntegration::DefaultWebClientObserver* observer,
-      const std::string& protocol) OVERRIDE {
+      const std::string& protocol) override {
     VLOG(1) << "CreateShellWorker";
     return NULL;
   }
 
   virtual ProtocolHandlerRegistry::DefaultClientObserver* CreateShellObserver(
-      ProtocolHandlerRegistry* registry) OVERRIDE {
+      ProtocolHandlerRegistry* registry) override {
     return NULL;
   }
 
   virtual void RegisterWithOSAsDefaultClient(
       const std::string& protocol,
-      ProtocolHandlerRegistry* registry) OVERRIDE {
+      ProtocolHandlerRegistry* registry) override {
     VLOG(1) << "Register With OS";
   }
 };
diff --git a/chrome/browser/ui/content_settings/content_setting_image_model.cc b/chrome/browser/ui/content_settings/content_setting_image_model.cc
index 09aff0a..2002a580 100644
--- a/chrome/browser/ui/content_settings/content_setting_image_model.cc
+++ b/chrome/browser/ui/content_settings/content_setting_image_model.cc
@@ -20,14 +20,14 @@ class ContentSettingBlockedImageModel : public ContentSettingImageModel {
   explicit ContentSettingBlockedImageModel(
       ContentSettingsType content_settings_type);
 
-  virtual void UpdateFromWebContents(WebContents* web_contents) OVERRIDE;
+  virtual void UpdateFromWebContents(WebContents* web_contents) override;
 };
 
 class ContentSettingGeolocationImageModel : public ContentSettingImageModel {
  public:
   ContentSettingGeolocationImageModel();
 
-  virtual void UpdateFromWebContents(WebContents* web_contents) OVERRIDE;
+  virtual void UpdateFromWebContents(WebContents* web_contents) override;
 };
 
 // Image model for displaying media icons in the location bar.
@@ -35,28 +35,28 @@ class ContentSettingMediaImageModel : public ContentSettingImageModel {
  public:
   explicit ContentSettingMediaImageModel(ContentSettingsType type);
 
-  virtual void UpdateFromWebContents(WebContents* web_contents) OVERRIDE;
+  virtual void UpdateFromWebContents(WebContents* web_contents) override;
 };
 
 class ContentSettingRPHImageModel : public ContentSettingImageModel {
  public:
   ContentSettingRPHImageModel();
 
-  virtual void UpdateFromWebContents(WebContents* web_contents) OVERRIDE;
+  virtual void UpdateFromWebContents(WebContents* web_contents) override;
 };
 
 class ContentSettingNotificationsImageModel : public ContentSettingImageModel {
  public:
   ContentSettingNotificationsImageModel();
 
-  virtual void UpdateFromWebContents(WebContents* web_contents) OVERRIDE;
+  virtual void UpdateFromWebContents(WebContents* web_contents) override;
 };
 
 class ContentSettingMIDISysExImageModel : public ContentSettingImageModel {
  public:
   ContentSettingMIDISysExImageModel();
 
-  virtual void UpdateFromWebContents(WebContents* web_contents) OVERRIDE;
+  virtual void UpdateFromWebContents(WebContents* web_contents) override;
 };
 
 namespace {
diff --git a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc
index 6c75a57..df964cd 100644
--- a/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc
+++ b/chrome/browser/ui/content_settings/content_setting_image_model_unittest.cc
@@ -38,7 +38,7 @@ class NotificationForwarder : public content::NotificationObserver {
 
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE {
+                       const content::NotificationDetails& details) override {
     if (type == chrome::NOTIFICATION_WEB_CONTENT_SETTINGS_CHANGED) {
       model_->UpdateFromWebContents(
           content::Source<content::WebContents>(source).ptr());
diff --git a/chrome/browser/ui/content_settings/content_setting_media_menu_model.h b/chrome/browser/ui/content_settings/content_setting_media_menu_model.h
index 6a630b98..9741a0c 100644
--- a/chrome/browser/ui/content_settings/content_setting_media_menu_model.h
+++ b/chrome/browser/ui/content_settings/content_setting_media_menu_model.h
@@ -29,12 +29,12 @@ class ContentSettingMediaMenuModel : public ui::SimpleMenuModel,
   virtual ~ContentSettingMediaMenuModel();
 
   // ui::SimpleMenuModel::Delegate:
-  virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
-  virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
+  virtual bool IsCommandIdChecked(int command_id) const override;
+  virtual bool IsCommandIdEnabled(int command_id) const override;
   virtual bool GetAcceleratorForCommandId(
       int command_id,
-      ui::Accelerator* accelerator) OVERRIDE;
-  virtual void ExecuteCommand(int command_id, int event_flags) OVERRIDE;
+      ui::Accelerator* accelerator) override;
+  virtual void ExecuteCommand(int command_id, int event_flags) override;
 
  private:
   typedef std::map<int, content::MediaStreamDevice> CommandMap;
diff --git a/chrome/browser/ui/crypto_module_delegate_nss.h b/chrome/browser/ui/crypto_module_delegate_nss.h
index f3b7c37..998d0e0 100644
--- a/chrome/browser/ui/crypto_module_delegate_nss.h
+++ b/chrome/browser/ui/crypto_module_delegate_nss.h
@@ -41,12 +41,12 @@ class ChromeNSSCryptoModuleDelegate
       WARN_UNUSED_RESULT;
 
   // crypto::NSSCryptoModuleDelegate implementation.
-  virtual crypto::ScopedPK11Slot RequestSlot() OVERRIDE;
+  virtual crypto::ScopedPK11Slot RequestSlot() override;
 
   // crypto::CryptoModuleBlockingPasswordDelegate implementation.
   virtual std::string RequestPassword(const std::string& slot_name,
                                       bool retry,
-                                      bool* cancelled) OVERRIDE;
+                                      bool* cancelled) override;
 
  private:
   void ShowDialog(const std::string& slot_name, bool retry);
diff --git a/chrome/browser/ui/extensions/application_launch.cc b/chrome/browser/ui/extensions/application_launch.cc
index 140751f..74ce425 100644
--- a/chrome/browser/ui/extensions/application_launch.cc
+++ b/chrome/browser/ui/extensions/application_launch.cc
@@ -90,7 +90,7 @@ class EnableViaAppListFlow : public ExtensionEnableFlowDelegate {
   }
 
   // ExtensionEnableFlowDelegate overrides.
-  virtual void ExtensionEnableFlowFinished() OVERRIDE {
+  virtual void ExtensionEnableFlowFinished() override {
     const Extension* extension =
         service_->GetExtensionById(extension_id_, false);
     if (!extension)
@@ -99,7 +99,7 @@ class EnableViaAppListFlow : public ExtensionEnableFlowDelegate {
     delete this;
   }
 
-  virtual void ExtensionEnableFlowAborted(bool user_initiated) OVERRIDE {
+  virtual void ExtensionEnableFlowAborted(bool user_initiated) override {
     delete this;
   }
 
diff --git a/chrome/browser/ui/extensions/extension_enable_flow.h b/chrome/browser/ui/extensions/extension_enable_flow.h
index 75db646..603a0e6 100644
--- a/chrome/browser/ui/extensions/extension_enable_flow.h
+++ b/chrome/browser/ui/extensions/extension_enable_flow.h
@@ -82,24 +82,24 @@ class ExtensionEnableFlow : public ExtensionInstallPrompt::Delegate,
   // content::NotificationObserver overrides:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // extensions::ExtensionRegistryObserver overrides:
   virtual void OnExtensionLoaded(
       content::BrowserContext* browser_context,
-      const extensions::Extension* extension) OVERRIDE;
+      const extensions::Extension* extension) override;
   virtual void OnExtensionUninstalled(
       content::BrowserContext* browser_context,
       const extensions::Extension* extension,
-      extensions::UninstallReason reason) OVERRIDE;
+      extensions::UninstallReason reason) override;
 
   // ExtensionInstallPrompt::Delegate overrides:
-  virtual void InstallUIProceed() OVERRIDE;
-  virtual void InstallUIAbort(bool user_initiated) OVERRIDE;
+  virtual void InstallUIProceed() override;
+  virtual void InstallUIAbort(bool user_initiated) override;
 
   // content::PageNavigator overrides:
   virtual content::WebContents* OpenURL(
-      const content::OpenURLParams& params) OVERRIDE;
+      const content::OpenURLParams& params) override;
 
   Profile* const profile_;
   const std::string extension_id_;
diff --git a/chrome/browser/ui/extensions/extension_install_ui_default.cc b/chrome/browser/ui/extensions/extension_install_ui_default.cc
index d6cad97..4ffc4a9 100644
--- a/chrome/browser/ui/extensions/extension_install_ui_default.cc
+++ b/chrome/browser/ui/extensions/extension_install_ui_default.cc
@@ -88,10 +88,10 @@ class ErrorInfoBarDelegate : public ConfirmInfoBarDelegate {
   virtual ~ErrorInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
-  virtual base::string16 GetMessageText() const OVERRIDE;
-  virtual int GetButtons() const OVERRIDE;
-  virtual base::string16 GetLinkText() const OVERRIDE;
-  virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
+  virtual base::string16 GetMessageText() const override;
+  virtual int GetButtons() const override;
+  virtual base::string16 GetLinkText() const override;
+  virtual bool LinkClicked(WindowOpenDisposition disposition) override;
 
   extensions::CrxInstallerError error_;
 
diff --git a/chrome/browser/ui/extensions/extension_install_ui_default.h b/chrome/browser/ui/extensions/extension_install_ui_default.h
index 345d80c..e93da66 100644
--- a/chrome/browser/ui/extensions/extension_install_ui_default.h
+++ b/chrome/browser/ui/extensions/extension_install_ui_default.h
@@ -18,10 +18,10 @@ class ExtensionInstallUIDefault : public ExtensionInstallUI {
 
   // ExtensionInstallUI:
   virtual void OnInstallSuccess(const extensions::Extension* extension,
-                                const SkBitmap* icon) OVERRIDE;
+                                const SkBitmap* icon) override;
   virtual void OnInstallFailure(
-      const extensions::CrxInstallerError& error) OVERRIDE;
-  virtual void SetUseAppInstalledBubble(bool use_bubble) OVERRIDE;
+      const extensions::CrxInstallerError& error) override;
+  virtual void SetUseAppInstalledBubble(bool use_bubble) override;
 
  private:
   // Used to undo theme installation.
diff --git a/chrome/browser/ui/extensions/extension_installed_bubble.h b/chrome/browser/ui/extensions/extension_installed_bubble.h
index 4982dd4..ab160f6 100644
--- a/chrome/browser/ui/extensions/extension_installed_bubble.h
+++ b/chrome/browser/ui/extensions/extension_installed_bubble.h
@@ -75,16 +75,16 @@ class ExtensionInstalledBubble : public content::NotificationObserver,
   // 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 OnExtensionLoaded(
       content::BrowserContext* browser_context,
-      const extensions::Extension* extension) OVERRIDE;
+      const extensions::Extension* extension) override;
   virtual void OnExtensionUnloaded(
       content::BrowserContext* browser_context,
       const extensions::Extension* extension,
-      extensions::UnloadedExtensionInfo::Reason reason) OVERRIDE;
+      extensions::UnloadedExtensionInfo::Reason reason) override;
 
   // The view delegate that shows the bubble. Owns us.
   Delegate* delegate_;
diff --git a/chrome/browser/ui/external_protocol_dialog_delegate.h b/chrome/browser/ui/external_protocol_dialog_delegate.h
index f925648..12879ca 100644
--- a/chrome/browser/ui/external_protocol_dialog_delegate.h
+++ b/chrome/browser/ui/external_protocol_dialog_delegate.h
@@ -22,12 +22,12 @@ class ExternalProtocolDialogDelegate : public ProtocolDialogDelegate {
 
   const base::string16& program_name() const { return program_name_; }
 
-  virtual void DoAccept(const GURL& url, bool dont_block) const OVERRIDE;
-  virtual void DoCancel(const GURL& url, bool dont_block) const OVERRIDE;
+  virtual void DoAccept(const GURL& url, bool dont_block) const override;
+  virtual void DoCancel(const GURL& url, bool dont_block) const override;
 
-  virtual base::string16 GetMessageText() const OVERRIDE;
-  virtual base::string16 GetCheckboxText() const OVERRIDE;
-  virtual base::string16 GetTitleText() const OVERRIDE;
+  virtual base::string16 GetMessageText() const override;
+  virtual base::string16 GetCheckboxText() const override;
+  virtual base::string16 GetTitleText() const override;
 
  private:
   int render_process_host_id_;
diff --git a/chrome/browser/ui/fast_unload_controller.cc b/chrome/browser/ui/fast_unload_controller.cc
index 7062872..65b988b 100644
--- a/chrome/browser/ui/fast_unload_controller.cc
+++ b/chrome/browser/ui/fast_unload_controller.cc
@@ -33,11 +33,11 @@ class FastUnloadController::DetachedWebContentsDelegate
 
  private:
   // WebContentsDelegate implementation.
-  virtual bool ShouldSuppressDialogs() OVERRIDE {
+  virtual bool ShouldSuppressDialogs() override {
     return true;  // Return true so dialogs are suppressed.
   }
 
-  virtual void CloseContents(content::WebContents* source) OVERRIDE {
+  virtual void CloseContents(content::WebContents* source) override {
     // Finished detached close.
     // FastUnloadController will observe
     // |NOTIFICATION_WEB_CONTENTS_DISCONNECTED|.
diff --git a/chrome/browser/ui/fast_unload_controller.h b/chrome/browser/ui/fast_unload_controller.h
index 7a8a452..15000c6 100644
--- a/chrome/browser/ui/fast_unload_controller.h
+++ b/chrome/browser/ui/fast_unload_controller.h
@@ -117,19 +117,19 @@ class FastUnloadController : public content::NotificationObserver,
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // Overridden from TabStripModelObserver:
   virtual void TabInsertedAt(content::WebContents* contents,
                              int index,
-                             bool foreground) OVERRIDE;
+                             bool foreground) override;
   virtual void TabDetachedAt(content::WebContents* contents,
-                             int index) OVERRIDE;
+                             int index) override;
   virtual void TabReplacedAt(TabStripModel* tab_strip_model,
                              content::WebContents* old_contents,
                              content::WebContents* new_contents,
-                             int index) OVERRIDE;
-  virtual void TabStripEmpty() OVERRIDE;
+                             int index) override;
+  virtual void TabStripEmpty() override;
 
   void TabAttachedImpl(content::WebContents* contents);
   void TabDetachedImpl(content::WebContents* contents);
diff --git a/chrome/browser/ui/find_bar/find_backend_unittest.cc b/chrome/browser/ui/find_bar/find_backend_unittest.cc
index 1940cc1..732a885 100644
--- a/chrome/browser/ui/find_bar/find_backend_unittest.cc
+++ b/chrome/browser/ui/find_bar/find_backend_unittest.cc
@@ -19,7 +19,7 @@ using content::WebContentsTester;
 
 class FindBackendTest : public ChromeRenderViewHostTestHarness {
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
     FindTabHelper::CreateForWebContents(web_contents());
   }
diff --git a/chrome/browser/ui/find_bar/find_bar_controller.h b/chrome/browser/ui/find_bar/find_bar_controller.h
index c73809f..82e7862 100644
--- a/chrome/browser/ui/find_bar/find_bar_controller.h
+++ b/chrome/browser/ui/find_bar/find_bar_controller.h
@@ -63,7 +63,7 @@ class FindBarController : public content::NotificationObserver {
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   FindBar* find_bar() const { return find_bar_.get(); }
 
diff --git a/chrome/browser/ui/find_bar/find_bar_state_factory.h b/chrome/browser/ui/find_bar/find_bar_state_factory.h
index b52c0b7..bf5c5b4 100644
--- a/chrome/browser/ui/find_bar/find_bar_state_factory.h
+++ b/chrome/browser/ui/find_bar/find_bar_state_factory.h
@@ -32,9 +32,9 @@ class FindBarStateFactory : public BrowserContextKeyedServiceFactory {
 
   // BrowserContextKeyedServiceFactory:
   virtual KeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* profile) const OVERRIDE;
+      content::BrowserContext* profile) const override;
   virtual content::BrowserContext* GetBrowserContextToUse(
-      content::BrowserContext* context) const OVERRIDE;
+      content::BrowserContext* context) const override;
 
   DISALLOW_COPY_AND_ASSIGN(FindBarStateFactory);
 };
diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller.h b/chrome/browser/ui/fullscreen/fullscreen_controller.h
index bbb4f8d..58e3383 100644
--- a/chrome/browser/ui/fullscreen/fullscreen_controller.h
+++ b/chrome/browser/ui/fullscreen/fullscreen_controller.h
@@ -145,7 +145,7 @@ class FullscreenController : public content::NotificationObserver {
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // Bubble Content ////////////////////////////////////////////////////////////
 
diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc
index e828c8a..c3968a0 100644
--- a/chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc
+++ b/chrome/browser/ui/fullscreen/fullscreen_controller_state_interactive_browsertest.cc
@@ -33,7 +33,7 @@ class FullscreenControllerStateInteractiveTest
       public FullscreenControllerStateTest {
  private:
   // FullscreenControllerStateTest override:
-  virtual Browser* GetBrowser() OVERRIDE;
+  virtual Browser* GetBrowser() override;
 };
 
 Browser* FullscreenControllerStateInteractiveTest::GetBrowser() {
diff --git a/chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.cc b/chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.cc
index d37b165..d008e59 100644
--- a/chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.cc
+++ b/chrome/browser/ui/fullscreen/fullscreen_controller_state_unittest.cc
@@ -40,18 +40,18 @@ class FullscreenControllerTestWindow : public TestBrowserWindow {
 
   // BrowserWindow Interface:
   virtual void EnterFullscreen(const GURL& url,
-                               FullscreenExitBubbleType type) OVERRIDE;
-  virtual void ExitFullscreen() OVERRIDE;
-  virtual bool ShouldHideUIForFullscreen() const OVERRIDE;
-  virtual bool IsFullscreen() const OVERRIDE;
+                               FullscreenExitBubbleType type) override;
+  virtual void ExitFullscreen() override;
+  virtual bool ShouldHideUIForFullscreen() const override;
+  virtual bool IsFullscreen() const override;
 #if defined(OS_WIN)
-  virtual void SetMetroSnapMode(bool enable) OVERRIDE;
-  virtual bool IsInMetroSnapMode() const OVERRIDE;
+  virtual void SetMetroSnapMode(bool enable) override;
+  virtual bool IsInMetroSnapMode() const override;
 #endif
 #if defined(OS_MACOSX)
-  virtual void EnterFullscreenWithChrome() OVERRIDE;
-  virtual bool IsFullscreenWithChrome() OVERRIDE;
-  virtual bool IsFullscreenWithoutChrome() OVERRIDE;
+  virtual void EnterFullscreenWithChrome() override;
+  virtual bool IsFullscreenWithChrome() override;
+  virtual bool IsFullscreenWithoutChrome() override;
 #endif
 
   static const char* GetWindowStateString(WindowState state);
@@ -213,16 +213,16 @@ class FullscreenControllerStateUnitTest : public BrowserWithTestWindowTest,
   FullscreenControllerStateUnitTest();
 
   // FullscreenControllerStateTest:
-  virtual void SetUp() OVERRIDE;
-  virtual BrowserWindow* CreateBrowserWindow() OVERRIDE;
-  virtual void ChangeWindowFullscreenState() OVERRIDE;
-  virtual const char* GetWindowStateString() OVERRIDE;
-  virtual void VerifyWindowState() OVERRIDE;
+  virtual void SetUp() override;
+  virtual BrowserWindow* CreateBrowserWindow() override;
+  virtual void ChangeWindowFullscreenState() override;
+  virtual const char* GetWindowStateString() override;
+  virtual void VerifyWindowState() override;
 
  protected:
   // FullscreenControllerStateTest:
-  virtual bool ShouldSkipStateAndEventPair(State state, Event event) OVERRIDE;
-  virtual Browser* GetBrowser() OVERRIDE;
+  virtual bool ShouldSkipStateAndEventPair(State state, Event event) override;
+  virtual Browser* GetBrowser() override;
   FullscreenControllerTestWindow* window_;
 };
 
diff --git a/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc b/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc
index b529fea..2109f5b 100644
--- a/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc
+++ b/chrome/browser/ui/gesture_prefs_observer_factory_aura.cc
@@ -65,7 +65,7 @@ class GesturePrefsObserver : public KeyedService {
   virtual ~GesturePrefsObserver();
 
   // KeyedService implementation.
-  virtual void Shutdown() OVERRIDE;
+  virtual void Shutdown() override;
 
  private:
   // Notification callback invoked when browser-side preferences
diff --git a/chrome/browser/ui/gesture_prefs_observer_factory_aura.h b/chrome/browser/ui/gesture_prefs_observer_factory_aura.h
index 8621066..4c0eb4c 100644
--- a/chrome/browser/ui/gesture_prefs_observer_factory_aura.h
+++ b/chrome/browser/ui/gesture_prefs_observer_factory_aura.h
@@ -28,13 +28,13 @@ class GesturePrefsObserverFactoryAura
 
   // BrowserContextKeyedServiceFactory:
   virtual KeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* profile) const OVERRIDE;
+      content::BrowserContext* profile) const override;
   virtual void RegisterProfilePrefs(
-      user_prefs::PrefRegistrySyncable* registry) OVERRIDE;
-  virtual bool ServiceIsCreatedWithBrowserContext() const OVERRIDE;
+      user_prefs::PrefRegistrySyncable* registry) override;
+  virtual bool ServiceIsCreatedWithBrowserContext() const override;
   virtual content::BrowserContext* GetBrowserContextToUse(
-      content::BrowserContext* context) const OVERRIDE;
-  virtual bool ServiceIsNULLWhileTesting() const OVERRIDE;
+      content::BrowserContext* context) const override;
+  virtual bool ServiceIsNULLWhileTesting() const override;
 
   DISALLOW_COPY_AND_ASSIGN(GesturePrefsObserverFactoryAura);
 };
diff --git a/chrome/browser/ui/global_error/global_error.h b/chrome/browser/ui/global_error/global_error.h
index 282f23c..bed55ec 100644
--- a/chrome/browser/ui/global_error/global_error.h
+++ b/chrome/browser/ui/global_error/global_error.h
@@ -98,10 +98,10 @@ class GlobalErrorWithStandardBubble
   virtual bool ShouldCloseOnDeactivate() const;
 
   // GlobalError overrides:
-  virtual bool HasBubbleView() OVERRIDE;
-  virtual bool HasShownBubbleView() OVERRIDE;
-  virtual void ShowBubbleView(Browser* browser) OVERRIDE;
-  virtual GlobalErrorBubbleViewBase* GetBubbleView() OVERRIDE;
+  virtual bool HasBubbleView() override;
+  virtual bool HasShownBubbleView() override;
+  virtual void ShowBubbleView(Browser* browser) override;
+  virtual GlobalErrorBubbleViewBase* GetBubbleView() override;
 
  private:
   bool has_shown_bubble_view_;
diff --git a/chrome/browser/ui/global_error/global_error_service_browsertest.cc b/chrome/browser/ui/global_error/global_error_service_browsertest.cc
index 3f84666..4c63f83 100644
--- a/chrome/browser/ui/global_error/global_error_service_browsertest.cc
+++ b/chrome/browser/ui/global_error/global_error_service_browsertest.cc
@@ -21,36 +21,36 @@ class BubbleViewError : public GlobalErrorWithStandardBubble {
 
   int bubble_view_close_count() { return bubble_view_close_count_; }
 
-  virtual bool HasMenuItem() OVERRIDE { return false; }
-  virtual int MenuItemCommandID() OVERRIDE {
+  virtual bool HasMenuItem() override { return false; }
+  virtual int MenuItemCommandID() override {
     ADD_FAILURE();
     return 0;
   }
-  virtual base::string16 MenuItemLabel() OVERRIDE {
+  virtual base::string16 MenuItemLabel() override {
     ADD_FAILURE();
     return base::string16();
   }
-  virtual void ExecuteMenuItem(Browser* browser) OVERRIDE { ADD_FAILURE(); }
+  virtual void ExecuteMenuItem(Browser* browser) override { ADD_FAILURE(); }
 
-  virtual bool HasBubbleView() OVERRIDE { return true; }
-  virtual base::string16 GetBubbleViewTitle() OVERRIDE {
+  virtual bool HasBubbleView() override { return true; }
+  virtual base::string16 GetBubbleViewTitle() override {
     return base::string16();
   }
-  virtual std::vector<base::string16> GetBubbleViewMessages() OVERRIDE {
+  virtual std::vector<base::string16> GetBubbleViewMessages() override {
     return std::vector<base::string16>();
   }
-  virtual base::string16 GetBubbleViewAcceptButtonLabel() OVERRIDE {
+  virtual base::string16 GetBubbleViewAcceptButtonLabel() override {
     return base::string16();
   }
-  virtual base::string16 GetBubbleViewCancelButtonLabel() OVERRIDE {
+  virtual base::string16 GetBubbleViewCancelButtonLabel() override {
     return base::string16();
   }
-  virtual void OnBubbleViewDidClose(Browser* browser) OVERRIDE {
+  virtual void OnBubbleViewDidClose(Browser* browser) override {
     EXPECT_TRUE(browser);
     ++bubble_view_close_count_;
   }
-  virtual void BubbleViewAcceptButtonPressed(Browser* browser) OVERRIDE {}
-  virtual void BubbleViewCancelButtonPressed(Browser* browser) OVERRIDE {}
+  virtual void BubbleViewAcceptButtonPressed(Browser* browser) override {}
+  virtual void BubbleViewCancelButtonPressed(Browser* browser) override {}
 
  private:
   int bubble_view_close_count_;
diff --git a/chrome/browser/ui/global_error/global_error_service_factory.h b/chrome/browser/ui/global_error/global_error_service_factory.h
index 8ec81eca..53f19d1 100644
--- a/chrome/browser/ui/global_error/global_error_service_factory.h
+++ b/chrome/browser/ui/global_error/global_error_service_factory.h
@@ -30,9 +30,9 @@ class GlobalErrorServiceFactory : public BrowserContextKeyedServiceFactory {
 
   // BrowserContextKeyedServiceFactory:
   virtual KeyedService* BuildServiceInstanceFor(
-      content::BrowserContext* profile) const OVERRIDE;
+      content::BrowserContext* profile) const override;
   virtual content::BrowserContext* GetBrowserContextToUse(
-      content::BrowserContext* context) const OVERRIDE;
+      content::BrowserContext* context) const override;
 
   DISALLOW_COPY_AND_ASSIGN(GlobalErrorServiceFactory);
 };
diff --git a/chrome/browser/ui/global_error/global_error_service_unittest.cc b/chrome/browser/ui/global_error/global_error_service_unittest.cc
index 5493392..1ffde05 100644
--- a/chrome/browser/ui/global_error/global_error_service_unittest.cc
+++ b/chrome/browser/ui/global_error/global_error_service_unittest.cc
@@ -19,21 +19,21 @@ class BaseError : public GlobalError {
 
   static int count() { return count_; }
 
-  virtual bool HasMenuItem() OVERRIDE { return false; }
-  virtual int MenuItemCommandID() OVERRIDE {
+  virtual bool HasMenuItem() override { return false; }
+  virtual int MenuItemCommandID() override {
     ADD_FAILURE();
     return 0;
   }
-  virtual base::string16 MenuItemLabel() OVERRIDE {
+  virtual base::string16 MenuItemLabel() override {
     ADD_FAILURE();
     return base::string16();
   }
-  virtual void ExecuteMenuItem(Browser* browser) OVERRIDE { ADD_FAILURE(); }
+  virtual void ExecuteMenuItem(Browser* browser) override { ADD_FAILURE(); }
 
-  virtual bool HasBubbleView() OVERRIDE { return false; }
-  virtual bool HasShownBubbleView() OVERRIDE { return false; }
-  virtual void ShowBubbleView(Browser* browser) OVERRIDE { ADD_FAILURE(); }
-  virtual GlobalErrorBubbleViewBase* GetBubbleView() OVERRIDE { return NULL; }
+  virtual bool HasBubbleView() override { return false; }
+  virtual bool HasShownBubbleView() override { return false; }
+  virtual void ShowBubbleView(Browser* browser) override { ADD_FAILURE(); }
+  virtual GlobalErrorBubbleViewBase* GetBubbleView() override { return NULL; }
 
  private:
   // This tracks the number BaseError objects that are currently instantiated.
@@ -52,12 +52,12 @@ class MenuError : public BaseError {
         severity_(severity) {
   }
 
-  virtual Severity GetSeverity() OVERRIDE { return severity_; }
+  virtual Severity GetSeverity() override { return severity_; }
 
-  virtual bool HasMenuItem() OVERRIDE { return true; }
-  virtual int MenuItemCommandID() OVERRIDE { return command_id_; }
-  virtual base::string16 MenuItemLabel() OVERRIDE { return base::string16(); }
-  virtual void ExecuteMenuItem(Browser* browser) OVERRIDE {}
+  virtual bool HasMenuItem() override { return true; }
+  virtual int MenuItemCommandID() override { return command_id_; }
+  virtual base::string16 MenuItemLabel() override { return base::string16(); }
+  virtual void ExecuteMenuItem(Browser* browser) override {}
 
  private:
   int command_id_;
diff --git a/chrome/browser/ui/hung_plugin_tab_helper.cc b/chrome/browser/ui/hung_plugin_tab_helper.cc
index 78f0759..3402726 100644
--- a/chrome/browser/ui/hung_plugin_tab_helper.cc
+++ b/chrome/browser/ui/hung_plugin_tab_helper.cc
@@ -143,11 +143,11 @@ class HungPluginInfoBarDelegate : public ConfirmInfoBarDelegate {
   virtual ~HungPluginInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
-  virtual int GetIconID() const OVERRIDE;
-  virtual base::string16 GetMessageText() const OVERRIDE;
-  virtual int GetButtons() const OVERRIDE;
-  virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
-  virtual bool Accept() OVERRIDE;
+  virtual int GetIconID() const override;
+  virtual base::string16 GetMessageText() const override;
+  virtual int GetButtons() const override;
+  virtual base::string16 GetButtonLabel(InfoBarButton button) const override;
+  virtual bool Accept() override;
 
   HungPluginTabHelper* helper_;
   int plugin_child_id_;
diff --git a/chrome/browser/ui/hung_plugin_tab_helper.h b/chrome/browser/ui/hung_plugin_tab_helper.h
index 6cf1a39..97b4f3a 100644
--- a/chrome/browser/ui/hung_plugin_tab_helper.h
+++ b/chrome/browser/ui/hung_plugin_tab_helper.h
@@ -45,15 +45,15 @@ class HungPluginTabHelper
 
   // content::WebContentsObserver:
   virtual void PluginCrashed(const base::FilePath& plugin_path,
-                             base::ProcessId plugin_pid) OVERRIDE;
+                             base::ProcessId plugin_pid) override;
   virtual void PluginHungStatusChanged(int plugin_child_id,
                                        const base::FilePath& plugin_path,
-                                       bool is_hung) OVERRIDE;
+                                       bool is_hung) override;
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // Called by an infobar when the user selects to kill the plugin.
   void KillPlugin(int child_id);
diff --git a/chrome/browser/ui/libgtk2ui/app_indicator_icon.h b/chrome/browser/ui/libgtk2ui/app_indicator_icon.h
index 69eefc8..54a9557 100644
--- a/chrome/browser/ui/libgtk2ui/app_indicator_icon.h
+++ b/chrome/browser/ui/libgtk2ui/app_indicator_icon.h
@@ -39,10 +39,10 @@ class AppIndicatorIcon : public views::StatusIconLinux {
   static bool CouldOpen();
 
   // Overridden from views::StatusIconLinux:
-  virtual void SetImage(const gfx::ImageSkia& image) OVERRIDE;
-  virtual void SetToolTip(const base::string16& tool_tip) OVERRIDE;
-  virtual void UpdatePlatformContextMenu(ui::MenuModel* menu) OVERRIDE;
-  virtual void RefreshPlatformContextMenu() OVERRIDE;
+  virtual void SetImage(const gfx::ImageSkia& image) override;
+  virtual void SetToolTip(const base::string16& tool_tip) override;
+  virtual void UpdatePlatformContextMenu(ui::MenuModel* menu) override;
+  virtual void RefreshPlatformContextMenu() override;
 
  private:
   void SetImageFromFile(const base::FilePath& icon_file_path);
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_border.cc b/chrome/browser/ui/libgtk2ui/gtk2_border.cc
index 535bed1..ac9d088 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_border.cc
+++ b/chrome/browser/ui/libgtk2ui/gtk2_border.cc
@@ -47,7 +47,7 @@ class ButtonImageSkiaSource : public gfx::ImageSkiaSource {
   virtual ~ButtonImageSkiaSource() {
   }
 
-  virtual gfx::ImageSkiaRep GetImageForScale(float scale) OVERRIDE {
+  virtual gfx::ImageSkiaRep GetImageForScale(float scale) override {
     int w = size_.width() * scale;
     int h = size_.height() * scale;
     return gfx::ImageSkiaRep(
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_border.h b/chrome/browser/ui/libgtk2ui/gtk2_border.h
index ebd41bf..6217b92 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_border.h
+++ b/chrome/browser/ui/libgtk2ui/gtk2_border.h
@@ -33,12 +33,12 @@ class Gtk2Border : public views::Border, public ui::NativeThemeObserver {
   virtual ~Gtk2Border();
 
   // Overridden from views::Border:
-  virtual void Paint(const views::View& view, gfx::Canvas* canvas) OVERRIDE;
-  virtual gfx::Insets GetInsets() const OVERRIDE;
-  virtual gfx::Size GetMinimumSize() const OVERRIDE;
+  virtual void Paint(const views::View& view, gfx::Canvas* canvas) override;
+  virtual gfx::Insets GetInsets() const override;
+  virtual gfx::Size GetMinimumSize() const override;
 
   // Overridden from views::NativeThemeChangeObserver:
-  virtual void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) OVERRIDE;
+  virtual void OnNativeThemeUpdated(ui::NativeTheme* observed_theme) override;
 
  private:
   void PaintState(const ui::NativeTheme::State state,
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_status_icon.h b/chrome/browser/ui/libgtk2ui/gtk2_status_icon.h
index fd95cc5..2401977 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_status_icon.h
+++ b/chrome/browser/ui/libgtk2ui/gtk2_status_icon.h
@@ -33,10 +33,10 @@ class Gtk2StatusIcon : public views::StatusIconLinux {
   virtual ~Gtk2StatusIcon();
 
   // Overridden from views::StatusIconLinux:
-  virtual void SetImage(const gfx::ImageSkia& image) OVERRIDE;
-  virtual void SetToolTip(const base::string16& tool_tip) OVERRIDE;
-  virtual void UpdatePlatformContextMenu(ui::MenuModel* menu) OVERRIDE;
-  virtual void RefreshPlatformContextMenu() OVERRIDE;
+  virtual void SetImage(const gfx::ImageSkia& image) override;
+  virtual void SetToolTip(const base::string16& tool_tip) override;
+  virtual void UpdatePlatformContextMenu(ui::MenuModel* menu) override;
+  virtual void RefreshPlatformContextMenu() override;
 
  private:
   CHROMEG_CALLBACK_0(Gtk2StatusIcon, void, OnClick, GtkStatusIcon*);
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_ui.h b/chrome/browser/ui/libgtk2ui/gtk2_ui.h
index 2a16c73..f982065 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_ui.h
+++ b/chrome/browser/ui/libgtk2ui/gtk2_ui.h
@@ -64,60 +64,60 @@ class Gtk2UI : public views::LinuxUI {
 
   // ui::LinuxInputMethodContextFactory:
   virtual scoped_ptr<ui::LinuxInputMethodContext> CreateInputMethodContext(
-      ui::LinuxInputMethodContextDelegate* delegate) const OVERRIDE;
+      ui::LinuxInputMethodContextDelegate* delegate) const override;
 
   // gfx::LinuxFontDelegate:
-  virtual gfx::FontRenderParams GetDefaultFontRenderParams() const OVERRIDE;
+  virtual gfx::FontRenderParams GetDefaultFontRenderParams() const override;
   virtual scoped_ptr<gfx::ScopedPangoFontDescription>
-      GetDefaultPangoFontDescription() const OVERRIDE;
-  virtual double GetFontDPI() const OVERRIDE;
+      GetDefaultPangoFontDescription() const override;
+  virtual double GetFontDPI() const override;
 
   // ui::LinuxShellDialog:
   virtual ui::SelectFileDialog* CreateSelectFileDialog(
       ui::SelectFileDialog::Listener* listener,
-      ui::SelectFilePolicy* policy) const OVERRIDE;
+      ui::SelectFilePolicy* policy) const override;
 
   // ui::LinuxUI:
-  virtual void Initialize() OVERRIDE;
-  virtual gfx::Image GetThemeImageNamed(int id) const OVERRIDE;
-  virtual bool GetColor(int id, SkColor* color) const OVERRIDE;
-  virtual bool HasCustomImage(int id) const OVERRIDE;
-  virtual SkColor GetFocusRingColor() const OVERRIDE;
-  virtual SkColor GetThumbActiveColor() const OVERRIDE;
-  virtual SkColor GetThumbInactiveColor() const OVERRIDE;
-  virtual SkColor GetTrackColor() const OVERRIDE;
-  virtual SkColor GetActiveSelectionBgColor() const OVERRIDE;
-  virtual SkColor GetActiveSelectionFgColor() const OVERRIDE;
-  virtual SkColor GetInactiveSelectionBgColor() const OVERRIDE;
-  virtual SkColor GetInactiveSelectionFgColor() const OVERRIDE;
-  virtual double GetCursorBlinkInterval() const OVERRIDE;
-  virtual ui::NativeTheme* GetNativeTheme(aura::Window* window) const OVERRIDE;
+  virtual void Initialize() override;
+  virtual gfx::Image GetThemeImageNamed(int id) const override;
+  virtual bool GetColor(int id, SkColor* color) const override;
+  virtual bool HasCustomImage(int id) const override;
+  virtual SkColor GetFocusRingColor() const override;
+  virtual SkColor GetThumbActiveColor() const override;
+  virtual SkColor GetThumbInactiveColor() const override;
+  virtual SkColor GetTrackColor() const override;
+  virtual SkColor GetActiveSelectionBgColor() const override;
+  virtual SkColor GetActiveSelectionFgColor() const override;
+  virtual SkColor GetInactiveSelectionBgColor() const override;
+  virtual SkColor GetInactiveSelectionFgColor() const override;
+  virtual double GetCursorBlinkInterval() const override;
+  virtual ui::NativeTheme* GetNativeTheme(aura::Window* window) const override;
   virtual void SetNativeThemeOverride(const NativeThemeGetter& callback)
-      OVERRIDE;
-  virtual bool GetDefaultUsesSystemTheme() const OVERRIDE;
-  virtual void SetDownloadCount(int count) const OVERRIDE;
-  virtual void SetProgressFraction(float percentage) const OVERRIDE;
-  virtual bool IsStatusIconSupported() const OVERRIDE;
+      override;
+  virtual bool GetDefaultUsesSystemTheme() const override;
+  virtual void SetDownloadCount(int count) const override;
+  virtual void SetProgressFraction(float percentage) const override;
+  virtual bool IsStatusIconSupported() const override;
   virtual scoped_ptr<views::StatusIconLinux> CreateLinuxStatusIcon(
       const gfx::ImageSkia& image,
-      const base::string16& tool_tip) const OVERRIDE;
+      const base::string16& tool_tip) const override;
   virtual gfx::Image GetIconForContentType(
-      const std::string& content_type, int size) const OVERRIDE;
+      const std::string& content_type, int size) const override;
   virtual scoped_ptr<views::Border> CreateNativeBorder(
       views::LabelButton* owning_button,
-      scoped_ptr<views::LabelButtonBorder> border) OVERRIDE;
+      scoped_ptr<views::LabelButtonBorder> border) override;
   virtual void AddWindowButtonOrderObserver(
-      views::WindowButtonOrderObserver* observer) OVERRIDE;
+      views::WindowButtonOrderObserver* observer) override;
   virtual void RemoveWindowButtonOrderObserver(
-      views::WindowButtonOrderObserver* observer) OVERRIDE;
-  virtual bool UnityIsRunning() OVERRIDE;
-  virtual NonClientMiddleClickAction GetNonClientMiddleClickAction() OVERRIDE;
-  virtual void NotifyWindowManagerStartupComplete() OVERRIDE;
+      views::WindowButtonOrderObserver* observer) override;
+  virtual bool UnityIsRunning() override;
+  virtual NonClientMiddleClickAction GetNonClientMiddleClickAction() override;
+  virtual void NotifyWindowManagerStartupComplete() override;
 
   // ui::TextEditKeybindingDelegate:
   virtual bool MatchEvent(
       const ui::Event& event,
-      std::vector<ui::TextEditCommandAuraLinux>* commands) OVERRIDE;
+      std::vector<ui::TextEditCommandAuraLinux>* commands) override;
 
  private:
   typedef std::map<int, SkColor> ColorMap;
diff --git a/chrome/browser/ui/libgtk2ui/native_theme_gtk2.h b/chrome/browser/ui/libgtk2ui/native_theme_gtk2.h
index 5ed7c11..5dc3bda 100644
--- a/chrome/browser/ui/libgtk2ui/native_theme_gtk2.h
+++ b/chrome/browser/ui/libgtk2ui/native_theme_gtk2.h
@@ -24,22 +24,22 @@ class NativeThemeGtk2 : public ui::NativeThemeBase {
   // Overridden from ui::NativeThemeBase:
   virtual gfx::Size GetPartSize(Part part,
                                 State state,
-                                const ExtraParams& extra) const OVERRIDE;
+                                const ExtraParams& extra) const override;
   virtual void Paint(SkCanvas* canvas,
                      Part part,
                      State state,
                      const gfx::Rect& rect,
-                     const ExtraParams& extra) const OVERRIDE;
-  virtual SkColor GetSystemColor(ColorId color_id) const OVERRIDE;
+                     const ExtraParams& extra) const override;
+  virtual SkColor GetSystemColor(ColorId color_id) const override;
   virtual void PaintMenuPopupBackground(
       SkCanvas* canvas,
       const gfx::Size& size,
-      const MenuBackgroundExtraParams& menu_background) const OVERRIDE;
+      const MenuBackgroundExtraParams& menu_background) const override;
   virtual void PaintMenuItemBackground(
       SkCanvas* canvas,
       State state,
       const gfx::Rect& rect,
-      const MenuListExtraParams& menu_list) const OVERRIDE;
+      const MenuListExtraParams& menu_list) const override;
 
  private:
   NativeThemeGtk2();
diff --git a/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.h b/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.h
index 6c5ad43..b1b4f51 100644
--- a/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.h
+++ b/chrome/browser/ui/libgtk2ui/print_dialog_gtk2.h
@@ -37,16 +37,16 @@ class PrintDialogGtk2
       PrintingContextLinux* context);
 
   // printing::PrintDialogGtkInterface implementation.
-  virtual void UseDefaultSettings() OVERRIDE;
-  virtual bool UpdateSettings(printing::PrintSettings* settings) OVERRIDE;
+  virtual void UseDefaultSettings() override;
+  virtual bool UpdateSettings(printing::PrintSettings* settings) override;
   virtual void ShowDialog(
       gfx::NativeView parent_view,
       bool has_selection,
-      const PrintingContextLinux::PrintSettingsCallback& callback) OVERRIDE;
+      const PrintingContextLinux::PrintSettingsCallback& callback) override;
   virtual void PrintDocument(const printing::MetafilePlayer& metafile,
-                             const base::string16& document_name) OVERRIDE;
-  virtual void AddRefToDialog() OVERRIDE;
-  virtual void ReleaseDialog() OVERRIDE;
+                             const base::string16& document_name) override;
+  virtual void AddRefToDialog() override;
+  virtual void ReleaseDialog() override;
 
  private:
   friend struct content::BrowserThread::DeleteOnThread<
@@ -73,7 +73,7 @@ class PrintDialogGtk2
   void InitPrintSettings(printing::PrintSettings* settings);
 
   // aura::WindowObserver implementation.
-  virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
+  virtual void OnWindowDestroying(aura::Window* window) override;
 
   // Printing dialog callback.
   PrintingContextLinux::PrintSettingsCallback callback_;
diff --git a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h
index 2416044..dd1bdc9 100644
--- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h
+++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl.h
@@ -39,7 +39,7 @@ class SelectFileDialogImpl : public ui::SelectFileDialog {
   static bool CheckKDEDialogWorksOnUIThread();
 
   // BaseShellDialog implementation.
-  virtual void ListenerDestroyed() OVERRIDE;
+  virtual void ListenerDestroyed() override;
 
  protected:
   explicit SelectFileDialogImpl(Listener* listener,
diff --git a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc
index 24daaae..7f0bf79 100644
--- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc
+++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_gtk2.cc
@@ -56,7 +56,7 @@ class SelectFileDialogImplGTK : public SelectFileDialogImpl,
   virtual ~SelectFileDialogImplGTK();
 
   // BaseShellDialog implementation:
-  virtual bool IsRunning(gfx::NativeWindow parent_window) const OVERRIDE;
+  virtual bool IsRunning(gfx::NativeWindow parent_window) const override;
 
   // SelectFileDialog implementation.
   // |params| is user data we pass back via the Listener interface.
@@ -68,13 +68,13 @@ class SelectFileDialogImplGTK : public SelectFileDialogImpl,
       int file_type_index,
       const base::FilePath::StringType& default_extension,
       gfx::NativeWindow owning_window,
-      void* params) OVERRIDE;
+      void* params) override;
 
  private:
-  virtual bool HasMultipleFileTypeChoicesImpl() OVERRIDE;
+  virtual bool HasMultipleFileTypeChoicesImpl() override;
 
   // Overridden from aura::WindowObserver:
-  virtual void OnWindowDestroying(aura::Window* window) OVERRIDE;
+  virtual void OnWindowDestroying(aura::Window* window) override;
 
   // Add the filters from |file_types_| to |chooser|.
   void AddFilters(GtkFileChooser* chooser);
diff --git a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc
index 749c053..ac6e91a 100644
--- a/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc
+++ b/chrome/browser/ui/libgtk2ui/select_file_dialog_impl_kde.cc
@@ -54,7 +54,7 @@ class SelectFileDialogImplKDE : public SelectFileDialogImpl {
   virtual ~SelectFileDialogImplKDE();
 
   // BaseShellDialog implementation:
-  virtual bool IsRunning(gfx::NativeWindow parent_window) const OVERRIDE;
+  virtual bool IsRunning(gfx::NativeWindow parent_window) const override;
 
   // SelectFileDialog implementation.
   // |params| is user data we pass back via the Listener interface.
@@ -66,10 +66,10 @@ class SelectFileDialogImplKDE : public SelectFileDialogImpl {
       int file_type_index,
       const base::FilePath::StringType& default_extension,
       gfx::NativeWindow owning_window,
-      void* params) OVERRIDE;
+      void* params) override;
 
  private:
-  virtual bool HasMultipleFileTypeChoicesImpl() OVERRIDE;
+  virtual bool HasMultipleFileTypeChoicesImpl() override;
 
   struct KDialogParams {
     KDialogParams(const std::string& type, const std::string& title,
diff --git a/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h b/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h
index 48a5110..f64b66a 100644
--- a/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h
+++ b/chrome/browser/ui/libgtk2ui/x11_input_method_context_impl_gtk2.h
@@ -31,11 +31,11 @@ class X11InputMethodContextImplGtk2 : public ui::LinuxInputMethodContext {
   virtual ~X11InputMethodContextImplGtk2();
 
   // Overriden from ui::LinuxInputMethodContext
-  virtual bool DispatchKeyEvent(const ui::KeyEvent& key_event) OVERRIDE;
-  virtual void Reset() OVERRIDE;
+  virtual bool DispatchKeyEvent(const ui::KeyEvent& key_event) override;
+  virtual void Reset() override;
   virtual void OnTextInputTypeChanged(ui::TextInputType text_input_type)
-      OVERRIDE;
-  virtual void OnCaretBoundsChanged(const gfx::Rect& caret_bounds) OVERRIDE;
+      override;
+  virtual void OnCaretBoundsChanged(const gfx::Rect& caret_bounds) override;
 
  private:
   // Resets the cache of X modifier keycodes.
diff --git a/chrome/browser/ui/location_bar/location_bar_browsertest.cc b/chrome/browser/ui/location_bar/location_bar_browsertest.cc
index feb3321..3954b1a 100644
--- a/chrome/browser/ui/location_bar/location_bar_browsertest.cc
+++ b/chrome/browser/ui/location_bar/location_bar_browsertest.cc
@@ -46,7 +46,7 @@ class LocationBarBrowserTest : public ExtensionBrowserTest {
   virtual ~LocationBarBrowserTest() {}
 
  protected:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
 
   // Load an extension with a PageAction that sends a message when clicked.
   const extensions::Extension* LoadPageActionExtension(
@@ -170,7 +170,7 @@ class LocationBarBrowserTestWithRedesign : public LocationBarBrowserTest {
   virtual ~LocationBarBrowserTestWithRedesign() {}
 
  private:
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
 
   scoped_ptr<extensions::FeatureSwitch::ScopedOverride> enable_redesign_;
 
diff --git a/chrome/browser/ui/location_bar/origin_chip_info_unittest.cc b/chrome/browser/ui/location_bar/origin_chip_info_unittest.cc
index d91e9b1..f1eec26 100644
--- a/chrome/browser/ui/location_bar/origin_chip_info_unittest.cc
+++ b/chrome/browser/ui/location_bar/origin_chip_info_unittest.cc
@@ -52,7 +52,7 @@ class OriginChipInfoTest : public ChromeRenderViewHostTestHarness,
     EXPECT_EQ(expect_update, info_->Update(web_contents(), toolbar_model()));
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
 #if defined(OS_CHROMEOS)
     test_user_manager_.reset(new chromeos::ScopedTestUserManager());
@@ -61,7 +61,7 @@ class OriginChipInfoTest : public ChromeRenderViewHostTestHarness,
     info_.reset(new OriginChipInfo(this, profile()));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     info_.reset();
     toolbar_model_.reset();
 #if defined(OS_CHROMEOS)
@@ -71,7 +71,7 @@ class OriginChipInfoTest : public ChromeRenderViewHostTestHarness,
   }
 
   virtual void OnExtensionIconImageChanged(
-      extensions::IconImage* image) OVERRIDE {
+      extensions::IconImage* image) override {
     // We keep the value of |image| to check if it's set, but the actual value
     // is never used.
     icon_image_ = image;
diff --git a/chrome/browser/ui/login/login_interstitial_delegate.h b/chrome/browser/ui/login/login_interstitial_delegate.h
index c55a420..d09626e 100644
--- a/chrome/browser/ui/login/login_interstitial_delegate.h
+++ b/chrome/browser/ui/login/login_interstitial_delegate.h
@@ -33,10 +33,10 @@ class LoginInterstitialDelegate : public content::InterstitialPageDelegate {
   virtual ~LoginInterstitialDelegate();
 
   // content::InterstitialPageDelegate:
-  virtual void CommandReceived(const std::string& command) OVERRIDE;
+  virtual void CommandReceived(const std::string& command) override;
 
  protected:
-  virtual std::string GetHTMLContents() OVERRIDE;
+  virtual std::string GetHTMLContents() override;
 
  private:
   base::Closure callback_;
diff --git a/chrome/browser/ui/login/login_prompt.h b/chrome/browser/ui/login/login_prompt.h
index 19f5381..5b05c81 100644
--- a/chrome/browser/ui/login/login_prompt.h
+++ b/chrome/browser/ui/login/login_prompt.h
@@ -41,7 +41,7 @@ class LoginHandler : public content::ResourceDispatcherHostLoginDelegate,
                               net::URLRequest* request);
 
   // ResourceDispatcherHostLoginDelegate implementation:
-  virtual void OnRequestCancelled() OVERRIDE;
+  virtual void OnRequestCancelled() override;
 
   // Initializes the underlying platform specific view.
   virtual void BuildViewForPasswordManager(
@@ -70,7 +70,7 @@ class LoginHandler : public content::ResourceDispatcherHostLoginDelegate,
   // if it was waiting for the same authentication.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // Who/where/what asked for the authentication.
   const net::AuthChallengeInfo* auth_info() const { return auth_info_.get(); }
diff --git a/chrome/browser/ui/login/login_prompt_browsertest.cc b/chrome/browser/ui/login/login_prompt_browsertest.cc
index 2d0a2a8..c320653 100644
--- a/chrome/browser/ui/login/login_prompt_browsertest.cc
+++ b/chrome/browser/ui/login/login_prompt_browsertest.cc
@@ -96,11 +96,11 @@ class InterstitialObserver : public content::WebContentsObserver {
         detach_callback_(detach_callback) {
   }
 
-  virtual void DidAttachInterstitialPage() OVERRIDE {
+  virtual void DidAttachInterstitialPage() override {
     attach_callback_.Run();
   }
 
-  virtual void DidDetachInterstitialPage() OVERRIDE {
+  virtual void DidDetachInterstitialPage() override {
     detach_callback_.Run();
   }
 
diff --git a/chrome/browser/ui/login/login_prompt_test_utils.h b/chrome/browser/ui/login/login_prompt_test_utils.h
index 542af01..429435e 100644
--- a/chrome/browser/ui/login/login_prompt_test_utils.h
+++ b/chrome/browser/ui/login/login_prompt_test_utils.h
@@ -23,7 +23,7 @@ class LoginPromptBrowserTestObserver : public content::NotificationObserver {
 
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   void AddHandler(LoginHandler* handler);
 
@@ -92,7 +92,7 @@ class WindowedLoadStopObserver
  protected:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
  private:
   int remaining_notification_count_;  // Number of notifications remaining.
diff --git a/chrome/browser/ui/metro_pin_tab_helper_win.h b/chrome/browser/ui/metro_pin_tab_helper_win.h
index cbbbdaa..98ec19b 100644
--- a/chrome/browser/ui/metro_pin_tab_helper_win.h
+++ b/chrome/browser/ui/metro_pin_tab_helper_win.h
@@ -31,9 +31,9 @@ class MetroPinTabHelper
   // content::WebContentsObserver overrides:
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) OVERRIDE;
+      const content::FrameNavigateParams& params) override;
   virtual void DidUpdateFaviconURL(
-      const std::vector<content::FaviconURL>& candidates) OVERRIDE;
+      const std::vector<content::FaviconURL>& candidates) override;
 
  private:
   // The FaviconDownloader class handles downloading the favicons when a page
diff --git a/chrome/browser/ui/navigation_correction_tab_observer.h b/chrome/browser/ui/navigation_correction_tab_observer.h
index a0f44d9..86054ba 100644
--- a/chrome/browser/ui/navigation_correction_tab_observer.h
+++ b/chrome/browser/ui/navigation_correction_tab_observer.h
@@ -31,7 +31,7 @@ class NavigationCorrectionTabObserver
 
   // content::WebContentsObserver overrides:
   virtual void RenderViewCreated(
-      content::RenderViewHost* render_view_host) OVERRIDE;
+      content::RenderViewHost* render_view_host) override;
 
   // Internal helpers ----------------------------------------------------------
 
diff --git a/chrome/browser/ui/network_profile_bubble.cc b/chrome/browser/ui/network_profile_bubble.cc
index d241eaa..8d4c73e 100644
--- a/chrome/browser/ui/network_profile_bubble.cc
+++ b/chrome/browser/ui/network_profile_bubble.cc
@@ -44,9 +44,9 @@ class BrowserListObserver : public chrome::BrowserListObserver {
   virtual ~BrowserListObserver();
 
   // Overridden from chrome::BrowserListObserver:
-  virtual void OnBrowserAdded(Browser* browser) OVERRIDE;
-  virtual void OnBrowserRemoved(Browser* browser) OVERRIDE;
-  virtual void OnBrowserSetLastActive(Browser* browser) OVERRIDE;
+  virtual void OnBrowserAdded(Browser* browser) override;
+  virtual void OnBrowserRemoved(Browser* browser) override;
+  virtual void OnBrowserSetLastActive(Browser* browser) override;
 };
 
 BrowserListObserver::~BrowserListObserver() {
diff --git a/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h b/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h
index 0bf2102..cef7468 100644
--- a/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h
+++ b/chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.h
@@ -41,8 +41,8 @@ class AlternateNavInfoBarDelegate : public infobars::InfoBarDelegate {
       scoped_ptr<AlternateNavInfoBarDelegate> delegate);
 
   // InfoBarDelegate:
-  virtual int GetIconID() const OVERRIDE;
-  virtual Type GetInfoBarType() const OVERRIDE;
+  virtual int GetIconID() const override;
+  virtual Type GetInfoBarType() const override;
 
   Profile* profile_;
   const base::string16 text_;
diff --git a/chrome/browser/ui/omnibox/omnibox_controller.h b/chrome/browser/ui/omnibox/omnibox_controller.h
index d5099ea..12e1277 100644
--- a/chrome/browser/ui/omnibox/omnibox_controller.h
+++ b/chrome/browser/ui/omnibox/omnibox_controller.h
@@ -43,7 +43,7 @@ class OmniboxController : public AutocompleteControllerDelegate {
   void StartAutocomplete(const AutocompleteInput& input) const;
 
   // AutocompleteControllerDelegate:
-  virtual void OnResultChanged(bool default_match_changed) OVERRIDE;
+  virtual void OnResultChanged(bool default_match_changed) override;
 
   AutocompleteController* autocomplete_controller() {
     return autocomplete_controller_.get();
diff --git a/chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.h b/chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.h
index 0094a2d..64bf027 100644
--- a/chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.h
+++ b/chrome/browser/ui/omnibox/omnibox_current_page_delegate_impl.h
@@ -18,24 +18,24 @@ class OmniboxCurrentPageDelegateImpl : public OmniboxCurrentPageDelegate {
   virtual ~OmniboxCurrentPageDelegateImpl();
 
   // OmniboxCurrentPageDelegate.
-  virtual bool CurrentPageExists() const OVERRIDE;
-  virtual const GURL& GetURL() const OVERRIDE;
-  virtual bool IsInstantNTP() const OVERRIDE;
-  virtual bool IsSearchResultsPage() const OVERRIDE;
-  virtual bool IsLoading() const OVERRIDE;
+  virtual bool CurrentPageExists() const override;
+  virtual const GURL& GetURL() const override;
+  virtual bool IsInstantNTP() const override;
+  virtual bool IsSearchResultsPage() const override;
+  virtual bool IsLoading() const override;
   virtual content::NavigationController&
-      GetNavigationController() const OVERRIDE;
-  virtual const SessionID& GetSessionID() const OVERRIDE;
+      GetNavigationController() const override;
+  virtual const SessionID& GetSessionID() const override;
   virtual bool ProcessExtensionKeyword(
       TemplateURL* template_url,
       const AutocompleteMatch& match,
-      WindowOpenDisposition disposition) OVERRIDE;
-  virtual void OnInputStateChanged() OVERRIDE;
+      WindowOpenDisposition disposition) override;
+  virtual void OnInputStateChanged() override;
   virtual void OnFocusChanged(OmniboxFocusState state,
-                              OmniboxFocusChangeReason reason) OVERRIDE;
-  virtual void DoPrerender(const AutocompleteMatch& match) OVERRIDE;
+                              OmniboxFocusChangeReason reason) override;
+  virtual void DoPrerender(const AutocompleteMatch& match) override;
   virtual void SetSuggestionToPrefetch(
-      const InstantSuggestion& suggestion) OVERRIDE;
+      const InstantSuggestion& suggestion) override;
 
  private:
   OmniboxEditController* controller_;
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc b/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc
index fb78658..d10e7e1 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_edit_unittest.cc
@@ -24,69 +24,69 @@ class TestingOmniboxView : public OmniboxView {
       : OmniboxView(NULL, controller, NULL) {}
 
   // OmniboxView:
-  virtual void SaveStateToTab(WebContents* tab) OVERRIDE {}
-  virtual void OnTabChanged(const WebContents* web_contents) OVERRIDE {}
-  virtual void Update() OVERRIDE {}
-  virtual void UpdatePlaceholderText() OVERRIDE {}
+  virtual void SaveStateToTab(WebContents* tab) override {}
+  virtual void OnTabChanged(const WebContents* web_contents) override {}
+  virtual void Update() override {}
+  virtual void UpdatePlaceholderText() override {}
   virtual void OpenMatch(const AutocompleteMatch& match,
                          WindowOpenDisposition disposition,
                          const GURL& alternate_nav_url,
                          const base::string16& pasted_text,
-                         size_t selected_line) OVERRIDE {}
-  virtual base::string16 GetText() const OVERRIDE { return text_; }
+                         size_t selected_line) override {}
+  virtual base::string16 GetText() const override { return text_; }
   virtual void SetUserText(const base::string16& text,
                            const base::string16& display_text,
-                           bool update_popup) OVERRIDE {
+                           bool update_popup) override {
     text_ = display_text;
   }
   virtual void SetWindowTextAndCaretPos(const base::string16& text,
                                         size_t caret_pos,
                                         bool update_popup,
-                                        bool notify_text_changed) OVERRIDE {
+                                        bool notify_text_changed) override {
     text_ = text;
   }
-  virtual void SetForcedQuery() OVERRIDE {}
-  virtual bool IsSelectAll() const OVERRIDE { return false; }
-  virtual bool DeleteAtEndPressed() OVERRIDE { return false; }
-  virtual void GetSelectionBounds(size_t* start, size_t* end) const OVERRIDE {}
-  virtual void SelectAll(bool reversed) OVERRIDE {}
-  virtual void RevertAll() OVERRIDE {}
-  virtual void UpdatePopup() OVERRIDE {}
-  virtual void SetFocus() OVERRIDE {}
-  virtual void ApplyCaretVisibility() OVERRIDE {}
+  virtual void SetForcedQuery() override {}
+  virtual bool IsSelectAll() const override { return false; }
+  virtual bool DeleteAtEndPressed() override { return false; }
+  virtual void GetSelectionBounds(size_t* start, size_t* end) const override {}
+  virtual void SelectAll(bool reversed) override {}
+  virtual void RevertAll() override {}
+  virtual void UpdatePopup() override {}
+  virtual void SetFocus() override {}
+  virtual void ApplyCaretVisibility() override {}
   virtual void OnTemporaryTextMaybeChanged(
       const base::string16& display_text,
       bool save_original_selection,
-      bool notify_text_changed) OVERRIDE {
+      bool notify_text_changed) override {
     text_ = display_text;
   }
   virtual bool OnInlineAutocompleteTextMaybeChanged(
-      const base::string16& display_text, size_t user_text_length) OVERRIDE {
+      const base::string16& display_text, size_t user_text_length) override {
     const bool text_changed = text_ != display_text;
     text_ = display_text;
     inline_autocomplete_text_ = display_text.substr(user_text_length);
     return text_changed;
   }
-  virtual void OnInlineAutocompleteTextCleared() OVERRIDE {
+  virtual void OnInlineAutocompleteTextCleared() override {
     inline_autocomplete_text_.clear();
   }
-  virtual void OnRevertTemporaryText() OVERRIDE {}
-  virtual void OnBeforePossibleChange() OVERRIDE {}
-  virtual bool OnAfterPossibleChange() OVERRIDE { return false; }
-  virtual gfx::NativeView GetNativeView() const OVERRIDE { return NULL; }
-  virtual gfx::NativeView GetRelativeWindowForPopup() const OVERRIDE {
+  virtual void OnRevertTemporaryText() override {}
+  virtual void OnBeforePossibleChange() override {}
+  virtual bool OnAfterPossibleChange() override { return false; }
+  virtual gfx::NativeView GetNativeView() const override { return NULL; }
+  virtual gfx::NativeView GetRelativeWindowForPopup() const override {
     return NULL;
   }
   virtual void SetGrayTextAutocompletion(
-      const base::string16& input) OVERRIDE {}
-  virtual base::string16 GetGrayTextAutocompletion() const OVERRIDE {
+      const base::string16& input) override {}
+  virtual base::string16 GetGrayTextAutocompletion() const override {
     return base::string16();
   }
-  virtual int GetTextWidth() const OVERRIDE { return 0; }
-  virtual int GetWidth() const OVERRIDE { return 0; }
-  virtual bool IsImeComposing() const OVERRIDE { return false; }
-  virtual int GetOmniboxTextLength() const OVERRIDE { return 0; }
-  virtual void EmphasizeURLComponents() OVERRIDE { }
+  virtual int GetTextWidth() const override { return 0; }
+  virtual int GetWidth() const override { return 0; }
+  virtual bool IsImeComposing() const override { return false; }
+  virtual int GetOmniboxTextLength() const override { return 0; }
+  virtual void EmphasizeURLComponents() override { }
 
   const base::string16& inline_autocomplete_text() const {
     return inline_autocomplete_text_;
@@ -108,16 +108,16 @@ class TestingOmniboxEditController : public OmniboxEditController {
 
  protected:
   // OmniboxEditController:
-  virtual void Update(const content::WebContents* contents) OVERRIDE {}
-  virtual void OnChanged() OVERRIDE {}
-  virtual void OnSetFocus() OVERRIDE {}
-  virtual void ShowURL() OVERRIDE {}
-  virtual void HideURL() OVERRIDE {}
-  virtual void EndOriginChipAnimations(bool cancel_fade) OVERRIDE {}
-  virtual InstantController* GetInstant() OVERRIDE { return NULL; }
-  virtual WebContents* GetWebContents() OVERRIDE { return NULL; }
-  virtual ToolbarModel* GetToolbarModel() OVERRIDE { return toolbar_model_; }
-  virtual const ToolbarModel* GetToolbarModel() const OVERRIDE {
+  virtual void Update(const content::WebContents* contents) override {}
+  virtual void OnChanged() override {}
+  virtual void OnSetFocus() override {}
+  virtual void ShowURL() override {}
+  virtual void HideURL() override {}
+  virtual void EndOriginChipAnimations(bool cancel_fade) override {}
+  virtual InstantController* GetInstant() override { return NULL; }
+  virtual WebContents* GetWebContents() override { return NULL; }
+  virtual ToolbarModel* GetToolbarModel() override { return toolbar_model_; }
+  virtual const ToolbarModel* GetToolbarModel() const override {
     return toolbar_model_;
   }
 
diff --git a/chrome/browser/ui/omnibox/omnibox_navigation_observer.h b/chrome/browser/ui/omnibox/omnibox_navigation_observer.h
index 0ea33714..98feca8 100644
--- a/chrome/browser/ui/omnibox/omnibox_navigation_observer.h
+++ b/chrome/browser/ui/omnibox/omnibox_navigation_observer.h
@@ -75,18 +75,18 @@ class OmniboxNavigationObserver : public content::NotificationObserver,
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // content::WebContentsObserver:
   virtual void DidStartNavigationToPendingEntry(
       const GURL& url,
-      content::NavigationController::ReloadType reload_type) OVERRIDE;
+      content::NavigationController::ReloadType reload_type) override;
   virtual void NavigationEntryCommitted(
-      const content::LoadCommittedDetails& load_details) OVERRIDE;
-  virtual void WebContentsDestroyed() OVERRIDE;
+      const content::LoadCommittedDetails& load_details) override;
+  virtual void WebContentsDestroyed() override;
 
   // net::URLFetcherDelegate:
-  virtual void OnURLFetchComplete(const net::URLFetcher* source) OVERRIDE;
+  virtual void OnURLFetchComplete(const net::URLFetcher* source) override;
 
   // Once the load has committed and any URL fetch has completed, this displays
   // the alternate nav infobar if necessary, and deletes |this|.
diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
index 378ba9c..eca9c5c 100644
--- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc
@@ -139,7 +139,7 @@ const int kCtrlOrCmdMask = ui::EF_CONTROL_DOWN;
 class OmniboxViewTest : public InProcessBrowserTest,
                         public content::NotificationObserver {
  protected:
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
     ASSERT_NO_FATAL_FAILURE(SetupComponents());
     chrome::FocusLocationBar(browser());
@@ -341,7 +341,7 @@ class OmniboxViewTest : public InProcessBrowserTest,
 
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE {
+                       const content::NotificationDetails& details) override {
     switch (type) {
       case content::NOTIFICATION_WEB_CONTENTS_DESTROYED:
       case chrome::NOTIFICATION_TAB_PARENTED:
diff --git a/chrome/browser/ui/omnibox/omnibox_view_unittest.cc b/chrome/browser/ui/omnibox/omnibox_view_unittest.cc
index 217f407..85e860a 100644
--- a/chrome/browser/ui/omnibox/omnibox_view_unittest.cc
+++ b/chrome/browser/ui/omnibox/omnibox_view_unittest.cc
@@ -18,7 +18,7 @@ namespace {
 
 class OmniboxViewTest : public PlatformTest {
  public:
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     ui::Clipboard::DestroyClipboardForCurrentThread();
   }
 
diff --git a/chrome/browser/ui/panels/base_panel_browser_test.cc b/chrome/browser/ui/panels/base_panel_browser_test.cc
index 1f53d27..0411f68 100644
--- a/chrome/browser/ui/panels/base_panel_browser_test.cc
+++ b/chrome/browser/ui/panels/base_panel_browser_test.cc
@@ -65,33 +65,33 @@ class MockDisplaySettingsProviderImpl :
   virtual ~MockDisplaySettingsProviderImpl() { }
 
   // Overridden from DisplaySettingsProvider:
-  virtual gfx::Rect GetPrimaryDisplayArea() const OVERRIDE;
-  virtual gfx::Rect GetPrimaryWorkArea() const OVERRIDE;
+  virtual gfx::Rect GetPrimaryDisplayArea() const override;
+  virtual gfx::Rect GetPrimaryWorkArea() const override;
   virtual gfx::Rect GetDisplayAreaMatching(
-      const gfx::Rect& bounds) const OVERRIDE;
+      const gfx::Rect& bounds) const override;
   virtual gfx::Rect GetWorkAreaMatching(
-      const gfx::Rect& bounds) const OVERRIDE;
+      const gfx::Rect& bounds) const override;
   virtual bool IsAutoHidingDesktopBarEnabled(
-      DesktopBarAlignment alignment) OVERRIDE;
+      DesktopBarAlignment alignment) override;
   virtual int GetDesktopBarThickness(
-      DesktopBarAlignment alignment) const OVERRIDE;
+      DesktopBarAlignment alignment) const override;
   virtual DesktopBarVisibility GetDesktopBarVisibility(
-      DesktopBarAlignment alignment) const OVERRIDE;
-  virtual bool IsFullScreen() OVERRIDE;
+      DesktopBarAlignment alignment) const override;
+  virtual bool IsFullScreen() override;
 
   // Overridden from MockDisplaySettingsProvider:
   virtual void SetPrimaryDisplay(
-      const gfx::Rect& display_area, const gfx::Rect& work_area) OVERRIDE;
+      const gfx::Rect& display_area, const gfx::Rect& work_area) override;
   virtual void SetSecondaryDisplay(
-      const gfx::Rect& display_area, const gfx::Rect& work_area) OVERRIDE;
+      const gfx::Rect& display_area, const gfx::Rect& work_area) override;
   virtual void EnableAutoHidingDesktopBar(DesktopBarAlignment alignment,
                                           bool enabled,
-                                          int thickness) OVERRIDE;
+                                          int thickness) override;
   virtual void SetDesktopBarVisibility(
-      DesktopBarAlignment alignment, DesktopBarVisibility visibility) OVERRIDE;
+      DesktopBarAlignment alignment, DesktopBarVisibility visibility) override;
   virtual void SetDesktopBarThickness(DesktopBarAlignment alignment,
-                                      int thickness) OVERRIDE;
-  virtual void EnableFullScreenMode(bool enabled) OVERRIDE;
+                                      int thickness) override;
+  virtual void EnableFullScreenMode(bool enabled) override;
 
  private:
   gfx::Rect primary_display_area_;
diff --git a/chrome/browser/ui/panels/base_panel_browser_test.h b/chrome/browser/ui/panels/base_panel_browser_test.h
index aa2e570..f99eb47 100644
--- a/chrome/browser/ui/panels/base_panel_browser_test.h
+++ b/chrome/browser/ui/panels/base_panel_browser_test.h
@@ -42,8 +42,8 @@ class BasePanelBrowserTest : public InProcessBrowserTest {
   BasePanelBrowserTest();
   virtual ~BasePanelBrowserTest();
 
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
-  virtual void SetUpOnMainThread() OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
+  virtual void SetUpOnMainThread() override;
 
  protected:
   enum ActiveState { SHOW_AS_ACTIVE, SHOW_AS_INACTIVE };
diff --git a/chrome/browser/ui/panels/detached_panel_collection.h b/chrome/browser/ui/panels/detached_panel_collection.h
index 21aeeac..59beb42 100644
--- a/chrome/browser/ui/panels/detached_panel_collection.h
+++ b/chrome/browser/ui/panels/detached_panel_collection.h
@@ -24,41 +24,41 @@ class DetachedPanelCollection : public PanelCollection {
   virtual ~DetachedPanelCollection();
 
   // PanelCollection OVERRIDES:
-  virtual void OnDisplayChanged() OVERRIDE;
-  virtual void RefreshLayout() OVERRIDE;
+  virtual void OnDisplayChanged() override;
+  virtual void RefreshLayout() override;
   virtual void AddPanel(Panel* panel,
-                        PositioningMask positioning_mask) OVERRIDE;
-  virtual void RemovePanel(Panel* panel, RemovalReason reason) OVERRIDE;
-  virtual void CloseAll() OVERRIDE;
+                        PositioningMask positioning_mask) override;
+  virtual void RemovePanel(Panel* panel, RemovalReason reason) override;
+  virtual void CloseAll() override;
   virtual void ResizePanelWindow(
       Panel* panel,
-      const gfx::Size& preferred_window_size) OVERRIDE;
+      const gfx::Size& preferred_window_size) override;
   virtual panel::Resizability GetPanelResizability(
-      const Panel* panel) const OVERRIDE;
+      const Panel* panel) const override;
   virtual void OnPanelResizedByMouse(Panel* panel,
-                                     const gfx::Rect& new_bounds) OVERRIDE;
-  virtual void OnPanelAttentionStateChanged(Panel* panel) OVERRIDE;
+                                     const gfx::Rect& new_bounds) override;
+  virtual void OnPanelAttentionStateChanged(Panel* panel) override;
   virtual void OnPanelTitlebarClicked(Panel* panel,
-                                      panel::ClickModifier modifier) OVERRIDE;
-  virtual void ActivatePanel(Panel* panel) OVERRIDE;
-  virtual void MinimizePanel(Panel* panel) OVERRIDE;
-  virtual void RestorePanel(Panel* panel) OVERRIDE;
+                                      panel::ClickModifier modifier) override;
+  virtual void ActivatePanel(Panel* panel) override;
+  virtual void MinimizePanel(Panel* panel) override;
+  virtual void RestorePanel(Panel* panel) override;
   virtual void OnMinimizeButtonClicked(Panel* panel,
-                                       panel::ClickModifier modifier) OVERRIDE;
+                                       panel::ClickModifier modifier) override;
   virtual void OnRestoreButtonClicked(Panel* panel,
-                                      panel::ClickModifier modifier) OVERRIDE;
-  virtual bool CanShowMinimizeButton(const Panel* panel) const OVERRIDE;
-  virtual bool CanShowRestoreButton(const Panel* panel) const OVERRIDE;
-  virtual bool IsPanelMinimized(const Panel* panel) const OVERRIDE;
-  virtual bool UsesAlwaysOnTopPanels() const OVERRIDE;
-  virtual void SavePanelPlacement(Panel* panel) OVERRIDE;
-  virtual void RestorePanelToSavedPlacement() OVERRIDE;
-  virtual void DiscardSavedPanelPlacement() OVERRIDE;
-  virtual void UpdatePanelOnCollectionChange(Panel* panel) OVERRIDE;
-  virtual void OnPanelExpansionStateChanged(Panel* panel) OVERRIDE;
-  virtual void OnPanelActiveStateChanged(Panel* panel) OVERRIDE;
+                                      panel::ClickModifier modifier) override;
+  virtual bool CanShowMinimizeButton(const Panel* panel) const override;
+  virtual bool CanShowRestoreButton(const Panel* panel) const override;
+  virtual bool IsPanelMinimized(const Panel* panel) const override;
+  virtual bool UsesAlwaysOnTopPanels() const override;
+  virtual void SavePanelPlacement(Panel* panel) override;
+  virtual void RestorePanelToSavedPlacement() override;
+  virtual void DiscardSavedPanelPlacement() override;
+  virtual void UpdatePanelOnCollectionChange(Panel* panel) override;
+  virtual void OnPanelExpansionStateChanged(Panel* panel) override;
+  virtual void OnPanelActiveStateChanged(Panel* panel) override;
   virtual gfx::Rect GetInitialPanelBounds(
-      const gfx::Rect& requested_bounds) const OVERRIDE;
+      const gfx::Rect& requested_bounds) const override;
 
   bool HasPanel(Panel* panel) const;
 
diff --git a/chrome/browser/ui/panels/docked_panel_browsertest.cc b/chrome/browser/ui/panels/docked_panel_browsertest.cc
index f79e91c..8cfb9cb 100644
--- a/chrome/browser/ui/panels/docked_panel_browsertest.cc
+++ b/chrome/browser/ui/panels/docked_panel_browsertest.cc
@@ -14,7 +14,7 @@
 
 class DockedPanelBrowserTest : public BasePanelBrowserTest {
  public:
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     BasePanelBrowserTest::SetUpOnMainThread();
 
     // All the tests here assume using mocked 800x600 display area for the
diff --git a/chrome/browser/ui/panels/docked_panel_collection.h b/chrome/browser/ui/panels/docked_panel_collection.h
index acdd3de..847bf8b 100644
--- a/chrome/browser/ui/panels/docked_panel_collection.h
+++ b/chrome/browser/ui/panels/docked_panel_collection.h
@@ -30,49 +30,49 @@ class DockedPanelCollection :
   virtual ~DockedPanelCollection();
 
   // PanelCollection OVERRIDES:
-  virtual void OnDisplayChanged() OVERRIDE;
+  virtual void OnDisplayChanged() override;
 
   // Rearranges the positions of the panels in the collection
   // and reduces their width when there is not enough room.
   // This is called when the display space has been changed, i.e. working
   // area being changed or a panel being closed.
-  virtual void RefreshLayout() OVERRIDE;
+  virtual void RefreshLayout() override;
 
   // Adds a panel to the collection. The panel may be a newly created panel or
   // one that is transitioning from another grouping of panels.
   virtual void AddPanel(Panel* panel,
-                        PositioningMask positioning_mask) OVERRIDE;
-  virtual void RemovePanel(Panel* pane, RemovalReason reasonl) OVERRIDE;
-  virtual void CloseAll() OVERRIDE;
+                        PositioningMask positioning_mask) override;
+  virtual void RemovePanel(Panel* pane, RemovalReason reasonl) override;
+  virtual void CloseAll() override;
   virtual void ResizePanelWindow(
       Panel* panel,
-      const gfx::Size& preferred_window_size) OVERRIDE;
+      const gfx::Size& preferred_window_size) override;
   virtual panel::Resizability GetPanelResizability(
-      const Panel* panel) const OVERRIDE;
+      const Panel* panel) const override;
   virtual void OnPanelResizedByMouse(Panel* panel,
-                                     const gfx::Rect& new_bounds) OVERRIDE;
-  virtual void OnPanelAttentionStateChanged(Panel* panel) OVERRIDE;
+                                     const gfx::Rect& new_bounds) override;
+  virtual void OnPanelAttentionStateChanged(Panel* panel) override;
   virtual void OnPanelTitlebarClicked(Panel* panel,
-                                      panel::ClickModifier modifier) OVERRIDE;
-  virtual void ActivatePanel(Panel* panel) OVERRIDE;
-  virtual void MinimizePanel(Panel* panel) OVERRIDE;
-  virtual void RestorePanel(Panel* panel) OVERRIDE;
+                                      panel::ClickModifier modifier) override;
+  virtual void ActivatePanel(Panel* panel) override;
+  virtual void MinimizePanel(Panel* panel) override;
+  virtual void RestorePanel(Panel* panel) override;
   virtual void OnMinimizeButtonClicked(Panel* panel,
-                                       panel::ClickModifier modifier) OVERRIDE;
+                                       panel::ClickModifier modifier) override;
   virtual void OnRestoreButtonClicked(Panel* panel,
-                                      panel::ClickModifier modifier) OVERRIDE;
-  virtual bool CanShowMinimizeButton(const Panel* panel) const OVERRIDE;
-  virtual bool CanShowRestoreButton(const Panel* panel) const OVERRIDE;
-  virtual bool IsPanelMinimized(const Panel* panel) const OVERRIDE;
-  virtual bool UsesAlwaysOnTopPanels() const OVERRIDE;
-  virtual void SavePanelPlacement(Panel* panel) OVERRIDE;
-  virtual void RestorePanelToSavedPlacement() OVERRIDE;
-  virtual void DiscardSavedPanelPlacement() OVERRIDE;
-  virtual void UpdatePanelOnCollectionChange(Panel* panel) OVERRIDE;
-  virtual void OnPanelExpansionStateChanged(Panel* panel) OVERRIDE;
-  virtual void OnPanelActiveStateChanged(Panel* panel) OVERRIDE;
+                                      panel::ClickModifier modifier) override;
+  virtual bool CanShowMinimizeButton(const Panel* panel) const override;
+  virtual bool CanShowRestoreButton(const Panel* panel) const override;
+  virtual bool IsPanelMinimized(const Panel* panel) const override;
+  virtual bool UsesAlwaysOnTopPanels() const override;
+  virtual void SavePanelPlacement(Panel* panel) override;
+  virtual void RestorePanelToSavedPlacement() override;
+  virtual void DiscardSavedPanelPlacement() override;
+  virtual void UpdatePanelOnCollectionChange(Panel* panel) override;
+  virtual void OnPanelExpansionStateChanged(Panel* panel) override;
+  virtual void OnPanelActiveStateChanged(Panel* panel) override;
   virtual gfx::Rect GetInitialPanelBounds(
-      const gfx::Rect& requested_bounds) const OVERRIDE;
+      const gfx::Rect& requested_bounds) const override;
 
   // Returns true if we should bring up the titlebars, given the current mouse
   // point.
@@ -128,15 +128,15 @@ class DockedPanelCollection :
   };
 
   // Overridden from PanelMouseWatcherObserver:
-  virtual void OnMouseMove(const gfx::Point& mouse_position) OVERRIDE;
+  virtual void OnMouseMove(const gfx::Point& mouse_position) override;
 
   // Overridden from DisplaySettingsProvider::DesktopBarObserver:
   virtual void OnAutoHidingDesktopBarVisibilityChanged(
       DisplaySettingsProvider::DesktopBarAlignment alignment,
-      DisplaySettingsProvider::DesktopBarVisibility visibility) OVERRIDE;
+      DisplaySettingsProvider::DesktopBarVisibility visibility) override;
   virtual void OnAutoHidingDesktopBarThicknessChanged(
       DisplaySettingsProvider::DesktopBarAlignment alignment,
-      int thickness) OVERRIDE;
+      int thickness) override;
 
   // Schedules a layout refresh with a short delay to avoid too much flicker.
   void ScheduleLayoutRefresh();
diff --git a/chrome/browser/ui/panels/panel.cc b/chrome/browser/ui/panels/panel.cc
index 70d9f46..c1bd50c 100644
--- a/chrome/browser/ui/panels/panel.cc
+++ b/chrome/browser/ui/panels/panel.cc
@@ -54,17 +54,17 @@ class PanelExtensionWindowController : public extensions::WindowController {
   virtual ~PanelExtensionWindowController();
 
   // Overridden from extensions::WindowController.
-  virtual int GetWindowId() const OVERRIDE;
-  virtual std::string GetWindowTypeText() const OVERRIDE;
+  virtual int GetWindowId() const override;
+  virtual std::string GetWindowTypeText() const override;
   virtual base::DictionaryValue* CreateWindowValueWithTabs(
-      const extensions::Extension* extension) const OVERRIDE;
+      const extensions::Extension* extension) const override;
   virtual base::DictionaryValue* CreateTabValue(
-      const extensions::Extension* extension, int tab_index) const OVERRIDE;
-  virtual bool CanClose(Reason* reason) const OVERRIDE;
+      const extensions::Extension* extension, int tab_index) const override;
+  virtual bool CanClose(Reason* reason) const override;
   virtual void SetFullscreenMode(bool is_fullscreen,
-                                 const GURL& extension_url) const OVERRIDE;
+                                 const GURL& extension_url) const override;
   virtual bool IsVisibleToExtension(
-      const extensions::Extension* extension) const OVERRIDE;
+      const extensions::Extension* extension) const override;
 
  private:
   Panel* panel_;  // Weak pointer. Owns us.
diff --git a/chrome/browser/ui/panels/panel.h b/chrome/browser/ui/panels/panel.h
index 4e53ec8..9f1dcc2e 100644
--- a/chrome/browser/ui/panels/panel.h
+++ b/chrome/browser/ui/panels/panel.h
@@ -116,43 +116,43 @@ class Panel : public ui::BaseWindow,
   bool CanShowRestoreButton() const;
 
   // ui::BaseWindow overrides.
-  virtual bool IsActive() const OVERRIDE;
-  virtual bool IsMaximized() const OVERRIDE;
-  virtual bool IsMinimized() const OVERRIDE;
-  virtual bool IsFullscreen() const OVERRIDE;
-  virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;
-  virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
-  virtual ui::WindowShowState GetRestoredState() const OVERRIDE;
-  virtual gfx::Rect GetBounds() const OVERRIDE;
-  virtual void Show() OVERRIDE;
-  virtual void Hide() OVERRIDE;
-  virtual void ShowInactive() OVERRIDE;
-  virtual void Close() OVERRIDE;
-  virtual void Activate() OVERRIDE;
-  virtual void Deactivate() OVERRIDE;
-  virtual void Maximize() OVERRIDE;
-  virtual void Minimize() OVERRIDE;
-  virtual void Restore() OVERRIDE;
-  virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
-  virtual void FlashFrame(bool flash) OVERRIDE;
-  virtual bool IsAlwaysOnTop() const OVERRIDE;
-  virtual void SetAlwaysOnTop(bool on_top) OVERRIDE;
+  virtual bool IsActive() const override;
+  virtual bool IsMaximized() const override;
+  virtual bool IsMinimized() const override;
+  virtual bool IsFullscreen() const override;
+  virtual gfx::NativeWindow GetNativeWindow() override;
+  virtual gfx::Rect GetRestoredBounds() const override;
+  virtual ui::WindowShowState GetRestoredState() const override;
+  virtual gfx::Rect GetBounds() const override;
+  virtual void Show() override;
+  virtual void Hide() override;
+  virtual void ShowInactive() override;
+  virtual void Close() override;
+  virtual void Activate() override;
+  virtual void Deactivate() override;
+  virtual void Maximize() override;
+  virtual void Minimize() override;
+  virtual void Restore() override;
+  virtual void SetBounds(const gfx::Rect& bounds) override;
+  virtual void FlashFrame(bool flash) override;
+  virtual bool IsAlwaysOnTop() const override;
+  virtual void SetAlwaysOnTop(bool on_top) override;
 
   // Overridden from CommandUpdaterDelegate:
   virtual void ExecuteCommandWithDisposition(
       int id,
-      WindowOpenDisposition disposition) OVERRIDE;
+      WindowOpenDisposition disposition) override;
 
   // content::NotificationObserver overrides.
   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;
 
   // Construct a native panel implementation.
   static NativePanel* CreateNativePanel(Panel* panel,
diff --git a/chrome/browser/ui/panels/panel_bounds_animation.h b/chrome/browser/ui/panels/panel_bounds_animation.h
index 16bde4a..ca22932 100644
--- a/chrome/browser/ui/panels/panel_bounds_animation.h
+++ b/chrome/browser/ui/panels/panel_bounds_animation.h
@@ -19,7 +19,7 @@ class PanelBoundsAnimation : public gfx::LinearAnimation {
                        const gfx::Rect& initial_bounds,
                        const gfx::Rect& final_bounds);
   virtual ~PanelBoundsAnimation();
-  virtual double GetCurrentValue() const OVERRIDE;
+  virtual double GetCurrentValue() const override;
 
   // Static because it is reused on Mac to override NSAnimation's calculation.
   static double ComputeAnimationValue(double progress,
@@ -27,7 +27,7 @@ class PanelBoundsAnimation : public gfx::LinearAnimation {
                                       double animation_stop_to_show_titlebar);
 
  protected:
-  virtual void AnimateToState(double state) OVERRIDE {}
+  virtual void AnimateToState(double state) override {}
 
  private:
   Panel* panel_;  // Weak, owns us.
diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc
index 7e15128..74a2a36 100644
--- a/chrome/browser/ui/panels/panel_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_browsertest.cc
@@ -363,7 +363,7 @@ class WaitForStableInitialSize : public TestPanelNotificationObserver {
   virtual ~WaitForStableInitialSize() {}
 
  protected:
-  virtual bool AtExpectedState() OVERRIDE {
+  virtual bool AtExpectedState() override {
     return panel_->GetBounds().height() > panel_->TitleOnlyHeight();
   }
   Panel* panel_;
@@ -380,7 +380,7 @@ class WaitForAutoResizeWider : public TestPanelNotificationObserver {
   virtual ~WaitForAutoResizeWider() {}
 
  protected:
-  virtual bool AtExpectedState() OVERRIDE {
+  virtual bool AtExpectedState() override {
     return panel_->GetBounds().width() > initial_size_.width();
   }
   Panel* panel_;
@@ -398,7 +398,7 @@ class WaitForAutoResizeNarrower : public TestPanelNotificationObserver {
   virtual ~WaitForAutoResizeNarrower() {}
 
  protected:
-  virtual bool AtExpectedState() OVERRIDE {
+  virtual bool AtExpectedState() override {
     return panel_->GetBounds().width() < initial_size_.width();
   }
   Panel* panel_;
@@ -1759,7 +1759,7 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
 
 class PanelExtensionApiTest : public ExtensionApiTest {
  protected:
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     ExtensionApiTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kEnablePanels);
   }
diff --git a/chrome/browser/ui/panels/panel_drag_browsertest.cc b/chrome/browser/ui/panels/panel_drag_browsertest.cc
index 5176544..2c96d44 100644
--- a/chrome/browser/ui/panels/panel_drag_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_drag_browsertest.cc
@@ -24,7 +24,7 @@ class PanelDragBrowserTest : public BasePanelBrowserTest {
   virtual ~PanelDragBrowserTest() {
   }
 
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     BasePanelBrowserTest::SetUpOnMainThread();
 
     // All the tests here assume using mocked 800x600 display area for the
diff --git a/chrome/browser/ui/panels/panel_extension_browsertest.cc b/chrome/browser/ui/panels/panel_extension_browsertest.cc
index 73c1ff1..1bd2f33 100644
--- a/chrome/browser/ui/panels/panel_extension_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_extension_browsertest.cc
@@ -33,7 +33,7 @@ using extensions::Extension;
 
 class PanelExtensionBrowserTest : public ExtensionBrowserTest {
  protected:
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     ExtensionBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kEnablePanels);
     PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir_);
@@ -127,7 +127,7 @@ class PanelContextMenu : public RenderViewContextMenu {
   // RenderViewContextMenu implementation.
   virtual bool GetAcceleratorForCommandId(
       int command_id,
-      ui::Accelerator* accelerator) OVERRIDE {
+      ui::Accelerator* accelerator) override {
     return false;
   }
 };
diff --git a/chrome/browser/ui/panels/panel_host.h b/chrome/browser/ui/panels/panel_host.h
index d622c23..1a1a274 100644
--- a/chrome/browser/ui/panels/panel_host.h
+++ b/chrome/browser/ui/panels/panel_host.h
@@ -50,44 +50,44 @@ class PanelHost : public content::WebContentsDelegate,
   // content::WebContentsDelegate overrides.
   virtual content::WebContents* OpenURLFromTab(
       content::WebContents* source,
-      const content::OpenURLParams& params) OVERRIDE;
+      const content::OpenURLParams& params) override;
   virtual void NavigationStateChanged(
       const content::WebContents* source,
-      content::InvalidateTypes changed_flags) OVERRIDE;
+      content::InvalidateTypes changed_flags) 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;
-  virtual void ActivateContents(content::WebContents* contents) OVERRIDE;
-  virtual void DeactivateContents(content::WebContents* contents) OVERRIDE;
+                              bool* was_blocked) override;
+  virtual void ActivateContents(content::WebContents* contents) override;
+  virtual void DeactivateContents(content::WebContents* contents) override;
   virtual void LoadingStateChanged(content::WebContents* source,
-                                   bool to_different_document) OVERRIDE;
-  virtual void CloseContents(content::WebContents* source) OVERRIDE;
+                                   bool to_different_document) override;
+  virtual void CloseContents(content::WebContents* source) override;
   virtual void MoveContents(content::WebContents* source,
-                            const gfx::Rect& pos) OVERRIDE;
+                            const gfx::Rect& pos) override;
   virtual bool IsPopupOrPanel(
-      const content::WebContents* source) const OVERRIDE;
-  virtual void ContentsZoomChange(bool zoom_in) OVERRIDE;
+      const content::WebContents* source) const override;
+  virtual void ContentsZoomChange(bool zoom_in) override;
   virtual void HandleKeyboardEvent(
       content::WebContents* source,
-      const content::NativeWebKeyboardEvent& event) OVERRIDE;
-  virtual void WebContentsFocused(content::WebContents* contents) OVERRIDE;
+      const content::NativeWebKeyboardEvent& event) override;
+  virtual void WebContentsFocused(content::WebContents* contents) override;
   virtual void ResizeDueToAutoResize(content::WebContents* web_contents,
-                                     const gfx::Size& new_size) OVERRIDE;
+                                     const gfx::Size& new_size) override;
 
   // content::WebContentsObserver overrides.
   virtual void RenderViewCreated(
-      content::RenderViewHost* render_view_host) OVERRIDE;
-  virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
-  virtual void WebContentsDestroyed() OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+      content::RenderViewHost* render_view_host) override;
+  virtual void RenderProcessGone(base::TerminationStatus status) override;
+  virtual void WebContentsDestroyed() 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;
+      override;
+  virtual content::WebContents* GetAssociatedWebContents() const override;
 
   // Actions on web contents.
   void Reload();
diff --git a/chrome/browser/ui/panels/panel_manager.h b/chrome/browser/ui/panels/panel_manager.h
index df0c5a3..408239e 100644
--- a/chrome/browser/ui/panels/panel_manager.h
+++ b/chrome/browser/ui/panels/panel_manager.h
@@ -196,10 +196,10 @@ class PanelManager : public DisplaySettingsProvider::DisplayObserver,
   void Initialize(DisplaySettingsProvider* provider);
 
   // Overridden from DisplaySettingsProvider::DisplayObserver:
-  virtual void OnDisplayChanged() OVERRIDE;
+  virtual void OnDisplayChanged() override;
 
   // Overridden from DisplaySettingsProvider::FullScreenObserver:
-  virtual void OnFullScreenModeChanged(bool is_full_screen) OVERRIDE;
+  virtual void OnFullScreenModeChanged(bool is_full_screen) override;
 
   // Returns the collection to which a new panel should add. The new panel
   // is expected to be created with |bounds| and |mode|. The size of |bounds|
diff --git a/chrome/browser/ui/panels/panel_mouse_watcher_timer.cc b/chrome/browser/ui/panels/panel_mouse_watcher_timer.cc
index 0572eda..f3d6471 100644
--- a/chrome/browser/ui/panels/panel_mouse_watcher_timer.cc
+++ b/chrome/browser/ui/panels/panel_mouse_watcher_timer.cc
@@ -15,10 +15,10 @@ class PanelMouseWatcherTimer : public PanelMouseWatcher {
   virtual ~PanelMouseWatcherTimer();
 
  private:
-  virtual void Start() OVERRIDE;
-  virtual void Stop() OVERRIDE;
-  virtual bool IsActive() const OVERRIDE;
-  virtual gfx::Point GetMousePosition() const OVERRIDE;
+  virtual void Start() override;
+  virtual void Stop() override;
+  virtual bool IsActive() const override;
+  virtual gfx::Point GetMousePosition() const override;
 
   // Specifies the rate at which we want to sample the mouse position.
   static const int kMousePollingIntervalMs = 250;
diff --git a/chrome/browser/ui/panels/panel_mouse_watcher_unittest.cc b/chrome/browser/ui/panels/panel_mouse_watcher_unittest.cc
index 8c08d8f..82e6dacf 100644
--- a/chrome/browser/ui/panels/panel_mouse_watcher_unittest.cc
+++ b/chrome/browser/ui/panels/panel_mouse_watcher_unittest.cc
@@ -13,7 +13,7 @@ class TestMouseObserver : public PanelMouseWatcherObserver {
  public:
   TestMouseObserver() : mouse_movements_(0) {}
   // Overridden from PanelMouseWatcherObserver:
-  virtual void OnMouseMove(const gfx::Point& mouse_position) OVERRIDE {
+  virtual void OnMouseMove(const gfx::Point& mouse_position) override {
     ++mouse_movements_;
   }
   int mouse_movements_;
diff --git a/chrome/browser/ui/panels/panel_resize_browsertest.cc b/chrome/browser/ui/panels/panel_resize_browsertest.cc
index 10102b4..aa9fbe2 100644
--- a/chrome/browser/ui/panels/panel_resize_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_resize_browsertest.cc
@@ -18,7 +18,7 @@ class PanelResizeBrowserTest : public BasePanelBrowserTest {
   virtual ~PanelResizeBrowserTest() {
   }
 
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     BasePanelBrowserTest::SetUpOnMainThread();
 
     // All the tests here assume using mocked 800x600 display area for the
diff --git a/chrome/browser/ui/panels/stacked_panel_collection.h b/chrome/browser/ui/panels/stacked_panel_collection.h
index 790910a..281e186 100644
--- a/chrome/browser/ui/panels/stacked_panel_collection.h
+++ b/chrome/browser/ui/panels/stacked_panel_collection.h
@@ -27,41 +27,41 @@ class StackedPanelCollection : public PanelCollection,
   virtual ~StackedPanelCollection();
 
   // PanelCollection OVERRIDES:
-  virtual void OnDisplayChanged() OVERRIDE;
-  virtual void RefreshLayout() OVERRIDE;
+  virtual void OnDisplayChanged() override;
+  virtual void RefreshLayout() override;
   virtual void AddPanel(Panel* panel,
-                        PositioningMask positioning_mask) OVERRIDE;
-  virtual void RemovePanel(Panel* panel, RemovalReason reason) OVERRIDE;
-  virtual void CloseAll() OVERRIDE;
+                        PositioningMask positioning_mask) override;
+  virtual void RemovePanel(Panel* panel, RemovalReason reason) override;
+  virtual void CloseAll() override;
   virtual void ResizePanelWindow(
       Panel* panel,
-      const gfx::Size& preferred_window_size) OVERRIDE;
+      const gfx::Size& preferred_window_size) override;
   virtual panel::Resizability GetPanelResizability(
-      const Panel* panel) const OVERRIDE;
+      const Panel* panel) const override;
   virtual void OnPanelResizedByMouse(Panel* panel,
-                                     const gfx::Rect& new_bounds) OVERRIDE;
-  virtual void OnPanelAttentionStateChanged(Panel* panel) OVERRIDE;
+                                     const gfx::Rect& new_bounds) override;
+  virtual void OnPanelAttentionStateChanged(Panel* panel) override;
   virtual void OnPanelTitlebarClicked(Panel* panel,
-                                      panel::ClickModifier modifier) OVERRIDE;
-  virtual void ActivatePanel(Panel* panel) OVERRIDE;
-  virtual void MinimizePanel(Panel* panel) OVERRIDE;
-  virtual void RestorePanel(Panel* panel) OVERRIDE;
+                                      panel::ClickModifier modifier) override;
+  virtual void ActivatePanel(Panel* panel) override;
+  virtual void MinimizePanel(Panel* panel) override;
+  virtual void RestorePanel(Panel* panel) override;
   virtual void OnMinimizeButtonClicked(Panel* panel,
-                                       panel::ClickModifier modifier) OVERRIDE;
+                                       panel::ClickModifier modifier) override;
   virtual void OnRestoreButtonClicked(Panel* panel,
-                                      panel::ClickModifier modifier) OVERRIDE;
-  virtual bool CanShowMinimizeButton(const Panel* panel) const OVERRIDE;
-  virtual bool CanShowRestoreButton(const Panel* panel) const OVERRIDE;
-  virtual bool IsPanelMinimized(const Panel* panel) const OVERRIDE;
-  virtual bool UsesAlwaysOnTopPanels() const OVERRIDE;
-  virtual void SavePanelPlacement(Panel* panel) OVERRIDE;
-  virtual void RestorePanelToSavedPlacement() OVERRIDE;
-  virtual void DiscardSavedPanelPlacement()  OVERRIDE;
-  virtual void UpdatePanelOnCollectionChange(Panel* panel) OVERRIDE;
-  virtual void OnPanelExpansionStateChanged(Panel* panel) OVERRIDE;
-  virtual void OnPanelActiveStateChanged(Panel* panel) OVERRIDE;
+                                      panel::ClickModifier modifier) override;
+  virtual bool CanShowMinimizeButton(const Panel* panel) const override;
+  virtual bool CanShowRestoreButton(const Panel* panel) const override;
+  virtual bool IsPanelMinimized(const Panel* panel) const override;
+  virtual bool UsesAlwaysOnTopPanels() const override;
+  virtual void SavePanelPlacement(Panel* panel) override;
+  virtual void RestorePanelToSavedPlacement() override;
+  virtual void DiscardSavedPanelPlacement()  override;
+  virtual void UpdatePanelOnCollectionChange(Panel* panel) override;
+  virtual void OnPanelExpansionStateChanged(Panel* panel) override;
+  virtual void OnPanelActiveStateChanged(Panel* panel) override;
   virtual gfx::Rect GetInitialPanelBounds(
-      const gfx::Rect& requested_bounds) const OVERRIDE;
+      const gfx::Rect& requested_bounds) const override;
 
   Panel* GetPanelAbove(Panel* panel) const;
   Panel* GetPanelBelow(Panel* panel) const;
@@ -104,9 +104,9 @@ class StackedPanelCollection : public PanelCollection,
   };
 
   // Overridden from PanelBoundsBatchUpdateObserver:
-  virtual base::string16 GetTitle() const OVERRIDE;
-  virtual gfx::Image GetIcon() const OVERRIDE;
-  virtual void PanelBoundsBatchUpdateCompleted() OVERRIDE;
+  virtual base::string16 GetTitle() const override;
+  virtual gfx::Image GetIcon() const override;
+  virtual void PanelBoundsBatchUpdateCompleted() override;
 
   // Returns the enclosing bounds that include all panels in the stack.
   gfx::Rect GetEnclosingBounds() const;
diff --git a/chrome/browser/ui/panels/test_panel_active_state_observer.h b/chrome/browser/ui/panels/test_panel_active_state_observer.h
index 48e76d0..dc852b2 100644
--- a/chrome/browser/ui/panels/test_panel_active_state_observer.h
+++ b/chrome/browser/ui/panels/test_panel_active_state_observer.h
@@ -21,7 +21,7 @@ class PanelActiveStateObserver : public TestPanelNotificationObserver {
 
  private:
   // TestNotificationObserver override:
-  virtual bool AtExpectedState() OVERRIDE;
+  virtual bool AtExpectedState() override;
 
   Panel* panel_;
   bool expect_active_;
diff --git a/chrome/browser/ui/panels/test_panel_collection_squeeze_observer.h b/chrome/browser/ui/panels/test_panel_collection_squeeze_observer.h
index 9554138..0fc2cfd 100644
--- a/chrome/browser/ui/panels/test_panel_collection_squeeze_observer.h
+++ b/chrome/browser/ui/panels/test_panel_collection_squeeze_observer.h
@@ -25,7 +25,7 @@ class PanelCollectionSqueezeObserver : public TestPanelNotificationObserver {
 
  private:
   // TestNotificationObserver override:
-  virtual bool AtExpectedState() OVERRIDE;
+  virtual bool AtExpectedState() override;
 
   bool IsSqueezed(Panel* panel);
 
diff --git a/chrome/browser/ui/panels/test_panel_mouse_watcher.h b/chrome/browser/ui/panels/test_panel_mouse_watcher.h
index 9bee22f..2fd7391 100644
--- a/chrome/browser/ui/panels/test_panel_mouse_watcher.h
+++ b/chrome/browser/ui/panels/test_panel_mouse_watcher.h
@@ -16,12 +16,12 @@ class TestPanelMouseWatcher : public PanelMouseWatcher {
   virtual ~TestPanelMouseWatcher();
 
  private:
-  virtual void Start() OVERRIDE;
-  virtual void Stop() OVERRIDE;
-  virtual bool IsActive() const OVERRIDE;
+  virtual void Start() override;
+  virtual void Stop() override;
+  virtual bool IsActive() const override;
 
-  virtual void NotifyMouseMovement(const gfx::Point& mouse_position) OVERRIDE;
-  virtual gfx::Point GetMousePosition() const OVERRIDE;
+  virtual void NotifyMouseMovement(const gfx::Point& mouse_position) override;
+  virtual gfx::Point GetMousePosition() const override;
 
   bool started_;
   gfx::Point mouse_position_;
diff --git a/chrome/browser/ui/panels/test_panel_notification_observer.h b/chrome/browser/ui/panels/test_panel_notification_observer.h
index 92b0915..327721d 100644
--- a/chrome/browser/ui/panels/test_panel_notification_observer.h
+++ b/chrome/browser/ui/panels/test_panel_notification_observer.h
@@ -30,7 +30,7 @@ class TestPanelNotificationObserver : public content::NotificationObserver {
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
  protected:
   virtual bool AtExpectedState() = 0;
diff --git a/chrome/browser/ui/passwords/manage_passwords_bubble_model_unittest.cc b/chrome/browser/ui/passwords/manage_passwords_bubble_model_unittest.cc
index adb385b..b5ee97a 100644
--- a/chrome/browser/ui/passwords/manage_passwords_bubble_model_unittest.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_bubble_model_unittest.cc
@@ -25,7 +25,7 @@ class ManagePasswordsBubbleModelTest : public testing::Test {
             content::WebContentsTester::CreateTestWebContents(&profile_,
                                                               NULL)) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     // Create the test UIController here so that it's bound to
     // |test_web_contents_| and therefore accessible to the model.
     new ManagePasswordsUIControllerMock(test_web_contents_.get());
@@ -33,7 +33,7 @@ class ManagePasswordsBubbleModelTest : public testing::Test {
     model_.reset(new ManagePasswordsBubbleModel(test_web_contents_.get()));
   }
 
-  virtual void TearDown() OVERRIDE { model_.reset(); }
+  virtual void TearDown() override { model_.reset(); }
 
   void PretendPasswordWaiting() {
     model_->set_state(password_manager::ui::PENDING_PASSWORD_AND_BUBBLE_STATE);
diff --git a/chrome/browser/ui/passwords/manage_passwords_icon_mock.h b/chrome/browser/ui/passwords/manage_passwords_icon_mock.h
index 089c7e9..053eb19 100644
--- a/chrome/browser/ui/passwords/manage_passwords_icon_mock.h
+++ b/chrome/browser/ui/passwords/manage_passwords_icon_mock.h
@@ -15,7 +15,7 @@ class ManagePasswordsIconMock : public ManagePasswordsIcon {
 
  protected:
   // ManagePasswordsIcon:
-  virtual void UpdateVisibleUI() OVERRIDE;
+  virtual void UpdateVisibleUI() override;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ManagePasswordsIconMock);
diff --git a/chrome/browser/ui/passwords/manage_passwords_test.h b/chrome/browser/ui/passwords/manage_passwords_test.h
index b04fca6..8829250 100644
--- a/chrome/browser/ui/passwords/manage_passwords_test.h
+++ b/chrome/browser/ui/passwords/manage_passwords_test.h
@@ -22,7 +22,7 @@ class ManagePasswordsTest : public InProcessBrowserTest {
   ManagePasswordsTest() {}
 
   // InProcessBrowserTest:
-  virtual void SetUpOnMainThread() OVERRIDE;
+  virtual void SetUpOnMainThread() override;
 
   // Get the mock UI controller for the current WebContents.
   ManagePasswordsUIControllerMock* controller();
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller.h b/chrome/browser/ui/passwords/manage_passwords_ui_controller.h
index bd15a86..ef9ed53 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller.h
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller.h
@@ -57,7 +57,7 @@ class ManagePasswordsUIController
 
   // PasswordStore::Observer implementation.
   virtual void OnLoginsChanged(
-      const password_manager::PasswordStoreChangeList& changes) OVERRIDE;
+      const password_manager::PasswordStoreChangeList& changes) override;
 
   // Called from the model when the user chooses to save a password; passes the
   // action off to the FormManager. The controller MUST be in a pending state,
@@ -107,8 +107,8 @@ class ManagePasswordsUIController
   // content::WebContentsObserver:
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) OVERRIDE;
-  virtual void WasHidden() OVERRIDE;
+      const content::FrameNavigateParams& params) override;
+  virtual void WasHidden() override;
 
   // We create copies of PasswordForm objects that come in with unclear lifetime
   // and store them in this vector as well as in |password_form_map_| to ensure
@@ -143,7 +143,7 @@ class ManagePasswordsUIController
   void UpdateBubbleAndIconVisibility();
 
   // content::WebContentsObserver:
-  virtual void WebContentsDestroyed() OVERRIDE;
+  virtual void WebContentsDestroyed() override;
 
   // Set by OnPasswordSubmitted() when the user submits a form containing login
   // information.  If the user responds to a subsequent "Do you want to save
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.h b/chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.h
index 020131b..aad8d50 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.h
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller_mock.h
@@ -28,19 +28,19 @@ class ManagePasswordsUIControllerMock
   // is native UI and therefore isn't available in a tab for unit tests.
   //
   // TODO(mkwst): Determine how to reasonably test this on that platform.
-  virtual void NavigateToPasswordManagerSettingsPage() OVERRIDE;
+  virtual void NavigateToPasswordManagerSettingsPage() override;
   bool navigated_to_settings_page() const {
     return navigated_to_settings_page_;
   }
 
   // We don't have a FormManager in tests, so stub these out.
-  virtual void SavePasswordInternal() OVERRIDE;
+  virtual void SavePasswordInternal() override;
   bool saved_password() const { return saved_password_; }
 
-  virtual void NeverSavePasswordInternal() OVERRIDE;
+  virtual void NeverSavePasswordInternal() override;
   bool never_saved_password() const { return never_saved_password_; }
 
-  virtual const autofill::PasswordForm& PendingCredentials() const OVERRIDE;
+  virtual const autofill::PasswordForm& PendingCredentials() const override;
   void SetPendingCredentials(autofill::PasswordForm pending_credentials);
 
   // Sneaky setters for testing.
diff --git a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
index 0aa2a1e..6efdc34 100644
--- a/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
+++ b/chrome/browser/ui/passwords/manage_passwords_ui_controller_unittest.cc
@@ -30,7 +30,7 @@ const int64 kQuickNavigationDelayInMS = 500;
 class MockElapsedTimer : public base::ElapsedTimer {
  public:
   MockElapsedTimer() {}
-  virtual base::TimeDelta Elapsed() const OVERRIDE { return delta_; }
+  virtual base::TimeDelta Elapsed() const override { return delta_; }
 
   void Advance(int64 ms) { delta_ = base::TimeDelta::FromMilliseconds(ms); }
 
@@ -46,7 +46,7 @@ class ManagePasswordsUIControllerTest : public ChromeRenderViewHostTestHarness {
  public:
   ManagePasswordsUIControllerTest() {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
 
     // Create the test UIController here so that it's bound to
diff --git a/chrome/browser/ui/passwords/password_manager_presenter.h b/chrome/browser/ui/passwords/password_manager_presenter.h
index 66c6846..4a27cc8 100644
--- a/chrome/browser/ui/passwords/password_manager_presenter.h
+++ b/chrome/browser/ui/passwords/password_manager_presenter.h
@@ -33,7 +33,7 @@ class PasswordManagerPresenter
 
   // PasswordStore::Observer implementation.
   virtual void OnLoginsChanged(
-      const password_manager::PasswordStoreChangeList& changes) OVERRIDE;
+      const password_manager::PasswordStoreChangeList& changes) override;
 
   // Repopulates the password and exception entries.
   void UpdatePasswordLists();
@@ -91,11 +91,11 @@ class PasswordManagerPresenter
     explicit PasswordListPopulater(PasswordManagerPresenter* page);
 
     // Send a query to the password store to populate a password list.
-    virtual void Populate() OVERRIDE;
+    virtual void Populate() override;
 
     // Send the password store's reply back to the handler.
     virtual void OnGetPasswordStoreResults(
-        const std::vector<autofill::PasswordForm*>& results) OVERRIDE;
+        const std::vector<autofill::PasswordForm*>& results) override;
   };
 
   // A short class to mediate requests to the password store for exceptions.
@@ -104,11 +104,11 @@ class PasswordManagerPresenter
     explicit PasswordExceptionListPopulater(PasswordManagerPresenter* page);
 
     // Send a query to the password store to populate a passwordException list.
-    virtual void Populate() OVERRIDE;
+    virtual void Populate() override;
 
     // Send the password store's reply back to the handler.
     virtual void OnGetPasswordStoreResults(
-        const std::vector<autofill::PasswordForm*>& results) OVERRIDE;
+        const std::vector<autofill::PasswordForm*>& results) override;
   };
 
   // Password store consumer for populating the password list and exceptions.
diff --git a/chrome/browser/ui/passwords/password_manager_presenter_unittest.cc b/chrome/browser/ui/passwords/password_manager_presenter_unittest.cc
index 1cee309..62722a2 100644
--- a/chrome/browser/ui/passwords/password_manager_presenter_unittest.cc
+++ b/chrome/browser/ui/passwords/password_manager_presenter_unittest.cc
@@ -23,9 +23,9 @@ class MockPasswordUIView : public PasswordUIView {
     password_manager_presenter_.Initialize();
   }
   virtual ~MockPasswordUIView() {}
-  virtual Profile* GetProfile() OVERRIDE;
+  virtual Profile* GetProfile() override;
 #if !defined(OS_ANDROID)
-  virtual gfx::NativeWindow GetNativeWindow() OVERRIDE;
+  virtual gfx::NativeWindow GetNativeWindow() override;
 #endif
   MOCK_METHOD2(ShowPassword, void(size_t, const base::string16&));
   MOCK_METHOD2(SetPasswordList,
@@ -53,7 +53,7 @@ class PasswordManagerPresenterTest : public testing::Test {
   PasswordManagerPresenterTest() {}
 
   virtual ~PasswordManagerPresenterTest() {}
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     PasswordStoreFactory::GetInstance()->SetTestingFactory(
         &profile_, MockPasswordStoreService::Build);
     mock_controller_.reset(new MockPasswordUIView(&profile_));
diff --git a/chrome/browser/ui/passwords/save_password_refusal_combobox_model.h b/chrome/browser/ui/passwords/save_password_refusal_combobox_model.h
index d966cea..5314cf2 100644
--- a/chrome/browser/ui/passwords/save_password_refusal_combobox_model.h
+++ b/chrome/browser/ui/passwords/save_password_refusal_combobox_model.h
@@ -19,10 +19,10 @@ class SavePasswordRefusalComboboxModel : public ui::ComboboxModel {
 
  private:
   // Overridden from ui::ComboboxModel:
-  virtual int GetItemCount() const OVERRIDE;
-  virtual base::string16 GetItemAt(int index) OVERRIDE;
-  virtual bool IsItemSeparatorAt(int index) OVERRIDE;
-  virtual int GetDefaultIndex() const OVERRIDE;
+  virtual int GetItemCount() const override;
+  virtual base::string16 GetItemAt(int index) override;
+  virtual bool IsItemSeparatorAt(int index) override;
+  virtual int GetDefaultIndex() const override;
 
   std::vector<base::string16> items_;
 
diff --git a/chrome/browser/ui/pdf/chrome_pdf_web_contents_helper_client.h b/chrome/browser/ui/pdf/chrome_pdf_web_contents_helper_client.h
index f8c9f96e..686174c 100644
--- a/chrome/browser/ui/pdf/chrome_pdf_web_contents_helper_client.h
+++ b/chrome/browser/ui/pdf/chrome_pdf_web_contents_helper_client.h
@@ -16,20 +16,20 @@ class ChromePDFWebContentsHelperClient
 
  private:
   // pdf::PDFWebContentsHelperClient:
-  virtual void UpdateLocationBar(content::WebContents* contents) OVERRIDE;
+  virtual void UpdateLocationBar(content::WebContents* contents) override;
 
   virtual void UpdateContentRestrictions(content::WebContents* contents,
-                                         int content_restrictions) OVERRIDE;
+                                         int content_restrictions) override;
 
   virtual void OnPDFHasUnsupportedFeature(
-      content::WebContents* contents) OVERRIDE;
+      content::WebContents* contents) override;
 
-  virtual void OnSaveURL(content::WebContents* contents) OVERRIDE;
+  virtual void OnSaveURL(content::WebContents* contents) override;
 
   virtual void OnShowPDFPasswordDialog(
       content::WebContents* contents,
       const base::string16& prompt,
-      const pdf::PasswordDialogClosedCallback& callback) OVERRIDE;
+      const pdf::PasswordDialogClosedCallback& callback) override;
 
   DISALLOW_COPY_AND_ASSIGN(ChromePDFWebContentsHelperClient);
 };
diff --git a/chrome/browser/ui/pdf/pdf_browsertest_base.h b/chrome/browser/ui/pdf/pdf_browsertest_base.h
index 909a7be..e60cd46 100644
--- a/chrome/browser/ui/pdf/pdf_browsertest_base.h
+++ b/chrome/browser/ui/pdf/pdf_browsertest_base.h
@@ -47,10 +47,10 @@ class PDFBrowserTest : public InProcessBrowserTest,
   // content::NotificationObserver
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // InProcessBrowserTest
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE;
+  virtual void SetUpCommandLine(base::CommandLine* command_line) override;
 
   // True if the snapshot differed from the expected value.
   bool snapshot_different_;
diff --git a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
index 5705cea..d3f791b 100644
--- a/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
+++ b/chrome/browser/ui/pdf/pdf_unsupported_feature.cc
@@ -59,13 +59,13 @@ class PDFEnableAdobeReaderPromptClient
   virtual ~PDFEnableAdobeReaderPromptClient();
 
   // pdf::OpenPDFInReaderPromptClient
-  virtual base::string16 GetMessageText() const OVERRIDE;
-  virtual base::string16 GetAcceptButtonText() const OVERRIDE;
-  virtual base::string16 GetCancelButtonText() const OVERRIDE;
+  virtual base::string16 GetMessageText() const override;
+  virtual base::string16 GetAcceptButtonText() const override;
+  virtual base::string16 GetCancelButtonText() const override;
   virtual bool ShouldExpire(
-      const content::LoadCommittedDetails& details) const OVERRIDE;
-  virtual void Accept() OVERRIDE;
-  virtual void Cancel() OVERRIDE;
+      const content::LoadCommittedDetails& details) const override;
+  virtual void Accept() override;
+  virtual void Cancel() override;
 
  private:
   void OnYes();
@@ -162,7 +162,7 @@ class PDFUnsupportedFeatureInterstitial
 
  protected:
   // InterstitialPageDelegate implementation.
-  virtual std::string GetHTMLContents() OVERRIDE {
+  virtual std::string GetHTMLContents() override {
     base::DictionaryValue strings;
     strings.SetString(
         "title",
@@ -190,7 +190,7 @@ class PDFUnsupportedFeatureInterstitial
     return webui::GetI18nTemplateHtml(html, &strings);
   }
 
-  virtual void CommandReceived(const std::string& command) OVERRIDE {
+  virtual void CommandReceived(const std::string& command) override {
     if (command == "0") {
       content::RecordAction(
           UserMetricsAction("PDF_ReaderInterstitialCancel"));
@@ -215,7 +215,7 @@ class PDFUnsupportedFeatureInterstitial
   }
 
   virtual void OverrideRendererPrefs(
-      content::RendererPreferences* prefs) OVERRIDE {
+      content::RendererPreferences* prefs) override {
     Profile* profile =
         Profile::FromBrowserContext(web_contents_->GetBrowserContext());
     renderer_preferences_util::UpdateFromSystemSettings(prefs, profile);
@@ -239,13 +239,13 @@ class PDFUnsupportedFeaturePromptClient
   virtual ~PDFUnsupportedFeaturePromptClient();
 
   // pdf::OpenPDFInReaderPromptClient:
-  virtual base::string16 GetMessageText() const OVERRIDE;
-  virtual base::string16 GetAcceptButtonText() const OVERRIDE;
-  virtual base::string16 GetCancelButtonText() const OVERRIDE;
+  virtual base::string16 GetMessageText() const override;
+  virtual base::string16 GetAcceptButtonText() const override;
+  virtual base::string16 GetCancelButtonText() const override;
   virtual bool ShouldExpire(
-      const content::LoadCommittedDetails& details) const OVERRIDE;
-  virtual void Accept() OVERRIDE;
-  virtual void Cancel() OVERRIDE;
+      const content::LoadCommittedDetails& details) const override;
+  virtual void Accept() override;
+  virtual void Cancel() override;
 
  private:
   WebContents* web_contents_;
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper.h b/chrome/browser/ui/prefs/prefs_tab_helper.h
index f97410d..45b6569 100644
--- a/chrome/browser/ui/prefs/prefs_tab_helper.h
+++ b/chrome/browser/ui/prefs/prefs_tab_helper.h
@@ -45,7 +45,7 @@ class PrefsTabHelper : public content::NotificationObserver,
   // content::NotificationObserver overrides:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   // Update the WebContents's RendererPreferences.
   void UpdateRendererPreferences();
diff --git a/chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc b/chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc
index 6eb19c7..97fe969 100644
--- a/chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc
+++ b/chrome/browser/ui/prefs/prefs_tab_helper_browsertest.cc
@@ -25,7 +25,7 @@ class PrefsTabHelperBrowserTest : public InProcessBrowserTest {
         .Append(chrome::kPreferencesFilename);
   }
 
-  virtual bool SetUpUserDataDirectory() OVERRIDE {
+  virtual bool SetUpUserDataDirectory() override {
     base::FilePath user_data_directory;
     PathService::Get(chrome::DIR_USER_DATA, &user_data_directory);
     base::FilePath default_profile =
diff --git a/chrome/browser/ui/sad_tab_helper.h b/chrome/browser/ui/sad_tab_helper.h
index f61da72e..db4c032 100644
--- a/chrome/browser/ui/sad_tab_helper.h
+++ b/chrome/browser/ui/sad_tab_helper.h
@@ -31,8 +31,8 @@ class SadTabHelper : public content::WebContentsObserver,
   void InstallSadTab(base::TerminationStatus status);
 
   // Overridden from content::WebContentsObserver:
-  virtual void RenderViewReady() OVERRIDE;
-  virtual void RenderProcessGone(base::TerminationStatus status) OVERRIDE;
+  virtual void RenderViewReady() override;
+  virtual void RenderProcessGone(base::TerminationStatus status) override;
 
   scoped_ptr<chrome::SadTab> sad_tab_;
 
diff --git a/chrome/browser/ui/screen_capture_notification_ui_stub.cc b/chrome/browser/ui/screen_capture_notification_ui_stub.cc
index d33ad4a..18dafa2 100644
--- a/chrome/browser/ui/screen_capture_notification_ui_stub.cc
+++ b/chrome/browser/ui/screen_capture_notification_ui_stub.cc
@@ -13,7 +13,7 @@ class ScreenCaptureNotificationUIStub : public ScreenCaptureNotificationUI {
   virtual ~ScreenCaptureNotificationUIStub() {}
 
   virtual gfx::NativeViewId OnStarted(const base::Closure& stop_callback)
-      OVERRIDE {
+      override {
     NOTIMPLEMENTED();
     return 0;
   }
diff --git a/chrome/browser/ui/search/instant_controller.h b/chrome/browser/ui/search/instant_controller.h
index 3cb7861..fa4fed6 100644
--- a/chrome/browser/ui/search/instant_controller.h
+++ b/chrome/browser/ui/search/instant_controller.h
@@ -116,10 +116,10 @@ class InstantController : public InstantPage::Delegate {
   // the RenderViewHost being created which is not always true. Fix this.
   virtual void InstantSupportDetermined(
       const content::WebContents* contents,
-      bool supports_instant) OVERRIDE;
+      bool supports_instant) override;
   virtual void InstantPageAboutToNavigateMainFrame(
       const content::WebContents* contents,
-      const GURL& url) OVERRIDE;
+      const GURL& url) override;
 
   // Helper function to navigate the given contents to the local fallback
   // Instant URL and trim the history correctly.
diff --git a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
index bed2ab1..06d196d 100644
--- a/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
+++ b/chrome/browser/ui/search/instant_extended_interactive_uitest.cc
@@ -91,11 +91,11 @@ class QuittingHistoryDBTask : public history::HistoryDBTask {
   QuittingHistoryDBTask() {}
 
   virtual bool RunOnDBThread(history::HistoryBackend* backend,
-                             history::HistoryDatabase* db) OVERRIDE {
+                             history::HistoryDatabase* db) override {
     return true;
   }
 
-  virtual void DoneRunOnMainThread() OVERRIDE {
+  virtual void DoneRunOnMainThread() override {
     base::MessageLoop::current()->Quit();
   }
 
@@ -109,7 +109,7 @@ class FakeNetworkChangeNotifier : public net::NetworkChangeNotifier {
  public:
   FakeNetworkChangeNotifier() : connection_type_(CONNECTION_NONE) {}
 
-  virtual ConnectionType GetCurrentConnectionType() const OVERRIDE {
+  virtual ConnectionType GetCurrentConnectionType() const override {
     return connection_type_;
   }
 
@@ -143,7 +143,7 @@ class InstantExtendedTest : public InProcessBrowserTest,
         on_toggle_voice_search_calls_(0) {
   }
  protected:
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+  virtual void SetUpInProcessBrowserTestFixture() override {
     chrome::EnableQueryExtractionForTesting();
     ASSERT_TRUE(https_test_server().Start());
     GURL instant_url = https_test_server().GetURL(
@@ -258,7 +258,7 @@ class InstantExtendedPrefetchTest : public InstantExtendedTest {
         fake_factory_(new net::FakeURLFetcherFactory(factory_.get())) {
   }
 
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+  virtual void SetUpInProcessBrowserTestFixture() override {
     chrome::EnableQueryExtractionForTesting();
     ASSERT_TRUE(https_test_server().Start());
     GURL instant_url = https_test_server().GetURL(
@@ -268,7 +268,7 @@ class InstantExtendedPrefetchTest : public InstantExtendedTest {
     InstantTestBase::Init(instant_url, ntp_url, true);
   }
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     command_line->AppendSwitchASCII(
         switches::kForceFieldTrials,
         "EmbeddedSearch/Group11 prefetch_results_srp:1/");
@@ -288,13 +288,13 @@ class InstantExtendedPrefetchTest : public InstantExtendedTest {
 
 class InstantExtendedNetworkTest : public InstantExtendedTest {
  protected:
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     disable_for_test_.reset(new net::NetworkChangeNotifier::DisableForTest);
     fake_network_change_notifier_.reset(new FakeNetworkChangeNotifier);
     InstantExtendedTest::SetUpOnMainThread();
   }
 
-  virtual void TearDownOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() override {
     InstantExtendedTest::TearDownOnMainThread();
     fake_network_change_notifier_.reset();
     disable_for_test_.reset();
@@ -317,7 +317,7 @@ class InstantPolicyTest : public ExtensionBrowserTest, public InstantTestBase {
   InstantPolicyTest() {}
 
  protected:
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+  virtual void SetUpInProcessBrowserTestFixture() override {
     ASSERT_TRUE(https_test_server().Start());
     GURL instant_url = https_test_server().GetURL(
         "files/instant_extended.html?strk=1&");
diff --git a/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc b/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc
index 5194c79..c49a4c7 100644
--- a/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc
+++ b/chrome/browser/ui/search/instant_extended_manual_interactive_uitest.cc
@@ -55,7 +55,7 @@ class InstantExtendedManualTest : public InProcessBrowserTest,
     host_resolver_proc_ = NULL;
   }
 
-  virtual void SetUpOnMainThread() OVERRIDE {
+  virtual void SetUpOnMainThread() override {
     const testing::TestInfo* const test_info =
         testing::UnitTest::GetInstance()->current_test_info();
     ASSERT_TRUE(StartsWithASCII(test_info->name(), "MANUAL_", true) ||
@@ -65,12 +65,12 @@ class InstantExtendedManualTest : public InProcessBrowserTest,
         new net::NetworkChangeNotifier::DisableForTest());
   }
 
-  virtual void TearDownOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() override {
     disable_network_change_notifier_.reset();
   }
 
  protected:
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+  virtual void SetUpInProcessBrowserTestFixture() override {
     chrome::EnableQueryExtractionForTesting();
   }
 
diff --git a/chrome/browser/ui/search/instant_page.h b/chrome/browser/ui/search/instant_page.h
index 1d6d069..cada762 100644
--- a/chrome/browser/ui/search/instant_page.h
+++ b/chrome/browser/ui/search/instant_page.h
@@ -102,11 +102,11 @@ class InstantPage : public content::WebContentsObserver,
   virtual void DidCommitProvisionalLoadForFrame(
       content::RenderFrameHost* render_frame_host,
       const GURL& url,
-      ui::PageTransition transition_type) OVERRIDE;
+      ui::PageTransition transition_type) override;
 
   // Overridden from SearchModelObserver:
   virtual void ModelChanged(const SearchModel::State& old_state,
-                            const SearchModel::State& new_state) OVERRIDE;
+                            const SearchModel::State& new_state) override;
 
   // Update the status of Instant support.
   void InstantSupportDetermined(bool supports_instant);
diff --git a/chrome/browser/ui/search/instant_page_unittest.cc b/chrome/browser/ui/search/instant_page_unittest.cc
index ce137dc..2682621 100644
--- a/chrome/browser/ui/search/instant_page_unittest.cc
+++ b/chrome/browser/ui/search/instant_page_unittest.cc
@@ -49,7 +49,7 @@ class FakePageDelegate : public InstantPage::Delegate {
 
 class InstantPageTest : public ChromeRenderViewHostTestHarness {
  public:
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   bool MessageWasSent(uint32 id) {
     return process()->sink().GetFirstMessageMatching(id) != NULL;
diff --git a/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc b/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc
index 09aae44..7fdfc52 100644
--- a/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc
+++ b/chrome/browser/ui/search/instant_search_prerenderer_unittest.cc
@@ -60,9 +60,9 @@ class DummyPrerenderContents : public PrerenderContents {
       int ALLOW_UNUSED creator_child_id,
       const gfx::Size& ALLOW_UNUSED size,
       content::SessionStorageNamespace* session_storage_namespace,
-      net::URLRequestContextGetter* request_context) OVERRIDE;
-  virtual bool GetChildId(int* child_id) const OVERRIDE;
-  virtual bool GetRouteId(int* route_id) const OVERRIDE;
+      net::URLRequestContextGetter* request_context) override;
+  virtual bool GetChildId(int* child_id) const override;
+  virtual bool GetRouteId(int* route_id) const override;
 
  private:
   Profile* profile_;
@@ -88,7 +88,7 @@ class DummyPrerenderContentsFactory : public PrerenderContents::Factory {
       const GURL& url,
       const Referrer& referrer,
       Origin origin,
-      uint8 experiment_id) OVERRIDE;
+      uint8 experiment_id) override;
 
  private:
   bool call_did_finish_load_;
@@ -165,7 +165,7 @@ class InstantSearchPrerendererTest : public InstantUnitTestBase {
   InstantSearchPrerendererTest() {}
 
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("EmbeddedSearch",
                                                        "Group1 strk:20"));
     InstantUnitTestBase::SetUp();
@@ -430,7 +430,7 @@ class ReuseInstantSearchBasePageTest : public InstantSearchPrerendererTest {
    ReuseInstantSearchBasePageTest() {}
 
   protected:
-   virtual void SetUp() OVERRIDE {
+   virtual void SetUp() override {
     ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial("EmbeddedSearch",
                                                        "Group1 strk:20"));
     InstantUnitTestBase::SetUp();
@@ -471,7 +471,7 @@ TEST_F(ReuseInstantSearchBasePageTest,
 #if !defined(OS_IOS) && !defined(OS_ANDROID)
 class TestUsePrerenderPage : public InstantSearchPrerendererTest {
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     // Disable query extraction flag in field trials.
     ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
         "EmbeddedSearch", "Group1 strk:20 query_extraction:0"));
diff --git a/chrome/browser/ui/search/instant_tab.h b/chrome/browser/ui/search/instant_tab.h
index e702929..4d644c6 100644
--- a/chrome/browser/ui/search/instant_tab.h
+++ b/chrome/browser/ui/search/instant_tab.h
@@ -27,7 +27,7 @@ class InstantTab : public InstantPage {
 
  private:
   // Overridden from InstantPage:
-  virtual bool ShouldProcessAboutToNavigateMainFrame() OVERRIDE;
+  virtual bool ShouldProcessAboutToNavigateMainFrame() override;
 
   DISALLOW_COPY_AND_ASSIGN(InstantTab);
 };
diff --git a/chrome/browser/ui/search/local_ntp_browsertest.cc b/chrome/browser/ui/search/local_ntp_browsertest.cc
index b2a8bd9..7f5ace6 100644
--- a/chrome/browser/ui/search/local_ntp_browsertest.cc
+++ b/chrome/browser/ui/search/local_ntp_browsertest.cc
@@ -21,7 +21,7 @@ class LocalNTPTest : public InProcessBrowserTest,
   LocalNTPTest() {}
 
  protected:
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
+  virtual void SetUpInProcessBrowserTestFixture() override {
     ASSERT_TRUE(https_test_server().Start());
     GURL instant_url = https_test_server().GetURL(
         "files/instant_extended.html?strk=1&");
diff --git a/chrome/browser/ui/search/search_delegate.h b/chrome/browser/ui/search/search_delegate.h
index c424453..9e4807d 100644
--- a/chrome/browser/ui/search/search_delegate.h
+++ b/chrome/browser/ui/search/search_delegate.h
@@ -28,7 +28,7 @@ class SearchDelegate : public SearchModelObserver {
 
   // Overrides for SearchModelObserver:
   virtual void ModelChanged(const SearchModel::State& old_state,
-                            const SearchModel::State& new_state) OVERRIDE;
+                            const SearchModel::State& new_state) override;
 
   // When the active tab is changed, the model state of this new active tab is
   // propagated to the browser.
diff --git a/chrome/browser/ui/search/search_ipc_router.h b/chrome/browser/ui/search/search_ipc_router.h
index d8b5e15a..561ca8f 100644
--- a/chrome/browser/ui/search/search_ipc_router.h
+++ b/chrome/browser/ui/search/search_ipc_router.h
@@ -184,7 +184,7 @@ class SearchIPCRouter : public content::WebContentsObserver {
   FRIEND_TEST_ALL_PREFIXES(SearchIPCRouterTest, HandleTabChangedEvents);
 
   // Overridden from contents::WebContentsObserver:
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
   void OnInstantSupportDetermined(int page_seq_no, bool supports_instant) const;
   void OnVoiceSearchSupportDetermined(int page_id,
diff --git a/chrome/browser/ui/search/search_ipc_router_policy_impl.h b/chrome/browser/ui/search/search_ipc_router_policy_impl.h
index 2812a64..ac707d3 100644
--- a/chrome/browser/ui/search/search_ipc_router_policy_impl.h
+++ b/chrome/browser/ui/search/search_ipc_router_policy_impl.h
@@ -21,25 +21,25 @@ class SearchIPCRouterPolicyImpl : public SearchIPCRouter::Policy {
   friend class SearchIPCRouterPolicyTest;
 
   // Overridden from SearchIPCRouter::Policy:
-  virtual bool ShouldProcessSetVoiceSearchSupport() OVERRIDE;
-  virtual bool ShouldProcessFocusOmnibox(bool is_active_tab) OVERRIDE;
-  virtual bool ShouldProcessNavigateToURL(bool is_active_tab) OVERRIDE;
-  virtual bool ShouldProcessDeleteMostVisitedItem() OVERRIDE;
-  virtual bool ShouldProcessUndoMostVisitedDeletion() OVERRIDE;
-  virtual bool ShouldProcessUndoAllMostVisitedDeletions() OVERRIDE;
-  virtual bool ShouldProcessLogEvent() OVERRIDE;
-  virtual bool ShouldProcessPasteIntoOmnibox(bool is_active_tab) OVERRIDE;
-  virtual bool ShouldProcessChromeIdentityCheck() OVERRIDE;
-  virtual bool ShouldSendSetPromoInformation() OVERRIDE;
-  virtual bool ShouldSendSetDisplayInstantResults() OVERRIDE;
-  virtual bool ShouldSendSetSuggestionToPrefetch() OVERRIDE;
-  virtual bool ShouldSendSetOmniboxStartMargin() OVERRIDE;
-  virtual bool ShouldSendSetInputInProgress(bool is_active_tab) OVERRIDE;
-  virtual bool ShouldSendOmniboxFocusChanged() OVERRIDE;
-  virtual bool ShouldSendMostVisitedItems() OVERRIDE;
-  virtual bool ShouldSendThemeBackgroundInfo() OVERRIDE;
-  virtual bool ShouldSendToggleVoiceSearch() OVERRIDE;
-  virtual bool ShouldSubmitQuery() OVERRIDE;
+  virtual bool ShouldProcessSetVoiceSearchSupport() override;
+  virtual bool ShouldProcessFocusOmnibox(bool is_active_tab) override;
+  virtual bool ShouldProcessNavigateToURL(bool is_active_tab) override;
+  virtual bool ShouldProcessDeleteMostVisitedItem() override;
+  virtual bool ShouldProcessUndoMostVisitedDeletion() override;
+  virtual bool ShouldProcessUndoAllMostVisitedDeletions() override;
+  virtual bool ShouldProcessLogEvent() override;
+  virtual bool ShouldProcessPasteIntoOmnibox(bool is_active_tab) override;
+  virtual bool ShouldProcessChromeIdentityCheck() override;
+  virtual bool ShouldSendSetPromoInformation() override;
+  virtual bool ShouldSendSetDisplayInstantResults() override;
+  virtual bool ShouldSendSetSuggestionToPrefetch() override;
+  virtual bool ShouldSendSetOmniboxStartMargin() override;
+  virtual bool ShouldSendSetInputInProgress(bool is_active_tab) override;
+  virtual bool ShouldSendOmniboxFocusChanged() override;
+  virtual bool ShouldSendMostVisitedItems() override;
+  virtual bool ShouldSendThemeBackgroundInfo() override;
+  virtual bool ShouldSendToggleVoiceSearch() override;
+  virtual bool ShouldSubmitQuery() override;
 
   // Used by unit tests.
   void set_is_incognito(bool is_incognito) {
diff --git a/chrome/browser/ui/search/search_model_unittest.cc b/chrome/browser/ui/search/search_model_unittest.cc
index c8a5ee9..3476ec3 100644
--- a/chrome/browser/ui/search/search_model_unittest.cc
+++ b/chrome/browser/ui/search/search_model_unittest.cc
@@ -19,7 +19,7 @@ class MockSearchModelObserver : public SearchModelObserver {
   virtual ~MockSearchModelObserver();
 
   virtual void ModelChanged(const SearchModel::State& old_state,
-                            const SearchModel::State& new_state) OVERRIDE;
+                            const SearchModel::State& new_state) override;
 
   void VerifySearchModelStates(const SearchModel::State& expected_old_state,
                                const SearchModel::State& expected_new_state);
@@ -66,8 +66,8 @@ void MockSearchModelObserver::VerifyNotificationCount(int expected_count) {
 
 class SearchModelTest : public ChromeRenderViewHostTestHarness {
  public:
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   MockSearchModelObserver mock_observer;
   SearchModel* model;
diff --git a/chrome/browser/ui/search/search_tab_helper.h b/chrome/browser/ui/search/search_tab_helper.h
index 75a3084..5e2c590 100644
--- a/chrome/browser/ui/search/search_tab_helper.h
+++ b/chrome/browser/ui/search/search_tab_helper.h
@@ -142,46 +142,46 @@ class SearchTabHelper : public content::WebContentsObserver,
 
   // Overridden from contents::WebContentsObserver:
   virtual void RenderViewCreated(
-      content::RenderViewHost* render_view_host) OVERRIDE;
+      content::RenderViewHost* render_view_host) override;
   virtual void DidStartNavigationToPendingEntry(
       const GURL& url,
-      content::NavigationController::ReloadType reload_type) OVERRIDE;
+      content::NavigationController::ReloadType reload_type) override;
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) OVERRIDE;
+      const content::FrameNavigateParams& params) override;
   virtual void DidFailProvisionalLoad(
       content::RenderFrameHost* render_frame_host,
       const GURL& validated_url,
       int error_code,
-      const base::string16& error_description) OVERRIDE;
+      const base::string16& error_description) override;
   virtual void DidFinishLoad(content::RenderFrameHost* render_frame_host,
-                             const GURL& validated_url) OVERRIDE;
+                             const GURL& validated_url) override;
   virtual void NavigationEntryCommitted(
-      const content::LoadCommittedDetails& load_details) OVERRIDE;
+      const content::LoadCommittedDetails& load_details) override;
 
   // Overridden from SearchIPCRouter::Delegate:
-  virtual void OnInstantSupportDetermined(bool supports_instant) OVERRIDE;
-  virtual void OnSetVoiceSearchSupport(bool supports_voice_search) OVERRIDE;
-  virtual void FocusOmnibox(OmniboxFocusState state) OVERRIDE;
+  virtual void OnInstantSupportDetermined(bool supports_instant) override;
+  virtual void OnSetVoiceSearchSupport(bool supports_voice_search) override;
+  virtual void FocusOmnibox(OmniboxFocusState state) override;
   virtual void NavigateToURL(const GURL& url,
                              WindowOpenDisposition disposition,
-                             bool is_most_visited_item_url) OVERRIDE;
-  virtual void OnDeleteMostVisitedItem(const GURL& url) OVERRIDE;
-  virtual void OnUndoMostVisitedDeletion(const GURL& url) OVERRIDE;
-  virtual void OnUndoAllMostVisitedDeletions() OVERRIDE;
-  virtual void OnLogEvent(NTPLoggingEventType event) OVERRIDE;
+                             bool is_most_visited_item_url) override;
+  virtual void OnDeleteMostVisitedItem(const GURL& url) override;
+  virtual void OnUndoMostVisitedDeletion(const GURL& url) override;
+  virtual void OnUndoAllMostVisitedDeletions() override;
+  virtual void OnLogEvent(NTPLoggingEventType event) override;
   virtual void OnLogMostVisitedImpression(
-      int position, const base::string16& provider) OVERRIDE;
+      int position, const base::string16& provider) override;
   virtual void OnLogMostVisitedNavigation(
-      int position, const base::string16& provider) OVERRIDE;
-  virtual void PasteIntoOmnibox(const base::string16& text) OVERRIDE;
-  virtual void OnChromeIdentityCheck(const base::string16& identity) OVERRIDE;
+      int position, const base::string16& provider) override;
+  virtual void PasteIntoOmnibox(const base::string16& text) override;
+  virtual void OnChromeIdentityCheck(const base::string16& identity) override;
 
   // Overridden from InstantServiceObserver:
-  virtual void ThemeInfoChanged(const ThemeBackgroundInfo& theme_info) OVERRIDE;
+  virtual void ThemeInfoChanged(const ThemeBackgroundInfo& theme_info) override;
   virtual void MostVisitedItemsChanged(
-      const std::vector<InstantMostVisitedItem>& items) OVERRIDE;
-  virtual void OmniboxStartMarginChanged(int omnibox_start_margin) OVERRIDE;
+      const std::vector<InstantMostVisitedItem>& items) override;
+  virtual void OmniboxStartMarginChanged(int omnibox_start_margin) override;
 
   // Sets the mode of the model based on the current URL of web_contents().
   // Only updates the origin part of the mode if |update_origin| is true,
diff --git a/chrome/browser/ui/search/search_tab_helper_unittest.cc b/chrome/browser/ui/search/search_tab_helper_unittest.cc
index 97e746a..b1bb230 100644
--- a/chrome/browser/ui/search/search_tab_helper_unittest.cc
+++ b/chrome/browser/ui/search/search_tab_helper_unittest.cc
@@ -78,7 +78,7 @@ class SearchTabHelperTest : public ChromeRenderViewHostTestHarness {
     SearchTabHelper::CreateForWebContents(web_contents());
   }
 
-  virtual content::BrowserContext* CreateBrowserContext() OVERRIDE {
+  virtual content::BrowserContext* CreateBrowserContext() override {
     TestingProfile::Builder builder;
     builder.AddTestingFactory(SigninManagerFactory::GetInstance(),
                               FakeSigninManagerBase::Build);
@@ -289,13 +289,13 @@ class TabTitleObserver : public content::WebContentsObserver {
       content::RenderFrameHost* /* render_frame_host */,
       const GURL& /* validated_url */,
       bool /* is_error_page */,
-      bool /* is_iframe_srcdoc */) OVERRIDE {
+      bool /* is_iframe_srcdoc */) override {
     title_on_start_ = web_contents()->GetTitle();
   }
 
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& /* details */,
-      const content::FrameNavigateParams& /* params */) OVERRIDE {
+      const content::FrameNavigateParams& /* params */) override {
     title_on_commit_ = web_contents()->GetTitle();
   }
 
@@ -314,7 +314,7 @@ TEST_F(SearchTabHelperTest, TitleIsSetForNTP) {
 
 class SearchTabHelperWindowTest : public BrowserWithTestWindowTest {
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     BrowserWithTestWindowTest::SetUp();
     TemplateURLServiceFactory::GetInstance()->SetTestingFactoryAndUse(
         profile(), &TemplateURLServiceFactory::BuildInstanceFor);
@@ -404,7 +404,7 @@ class SearchTabHelperPrerenderTest : public InstantUnitTestBase {
   virtual ~SearchTabHelperPrerenderTest() {}
 
  protected:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ASSERT_TRUE(base::FieldTrialList::CreateFieldTrial(
         "EmbeddedSearch",
         "Group1 espv:89 prefetch_results:1 "
diff --git a/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc b/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
index 58d3e6a..73ff82c 100644
--- a/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
+++ b/chrome/browser/ui/search_engines/keyword_editor_controller_unittest.cc
@@ -45,7 +45,7 @@ class KeywordEditorControllerTest : public testing::Test,
         added_count_(0),
         removed_count_(0) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     if (simulate_load_failure_)
       util_.model()->OnWebDataServiceRequestDone(0, NULL);
     else
@@ -55,23 +55,23 @@ class KeywordEditorControllerTest : public testing::Test,
     controller_->table_model()->SetObserver(this);
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     controller_.reset();
   }
 
-  virtual void OnModelChanged() OVERRIDE {
+  virtual void OnModelChanged() override {
     model_changed_count_++;
   }
 
-  virtual void OnItemsChanged(int start, int length) OVERRIDE {
+  virtual void OnItemsChanged(int start, int length) override {
     items_changed_count_++;
   }
 
-  virtual void OnItemsAdded(int start, int length) OVERRIDE {
+  virtual void OnItemsAdded(int start, int length) override {
     added_count_++;
   }
 
-  virtual void OnItemsRemoved(int start, int length) OVERRIDE {
+  virtual void OnItemsRemoved(int start, int length) override {
     removed_count_++;
   }
 
diff --git a/chrome/browser/ui/search_engines/search_engine_tab_helper.h b/chrome/browser/ui/search_engines/search_engine_tab_helper.h
index a341743..5b36ecd 100644
--- a/chrome/browser/ui/search_engines/search_engine_tab_helper.h
+++ b/chrome/browser/ui/search_engines/search_engine_tab_helper.h
@@ -29,8 +29,8 @@ class SearchEngineTabHelper
   // content::WebContentsObserver overrides.
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) OVERRIDE;
-  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
+      const content::FrameNavigateParams& params) override;
+  virtual bool OnMessageReceived(const IPC::Message& message) override;
 
  private:
   explicit SearchEngineTabHelper(content::WebContents* web_contents);
diff --git a/chrome/browser/ui/search_engines/template_url_table_model.h b/chrome/browser/ui/search_engines/template_url_table_model.h
index fffcc28..9711257 100644
--- a/chrome/browser/ui/search_engines/template_url_table_model.h
+++ b/chrome/browser/ui/search_engines/template_url_table_model.h
@@ -47,13 +47,13 @@ class TemplateURLTableModel : public ui::TableModel,
   void Reload();
 
   // ui::TableModel overrides.
-  virtual int RowCount() OVERRIDE;
-  virtual base::string16 GetText(int row, int column) OVERRIDE;
-  virtual gfx::ImageSkia GetIcon(int row) OVERRIDE;
-  virtual void SetObserver(ui::TableModelObserver* observer) OVERRIDE;
-  virtual bool HasGroups() OVERRIDE;
-  virtual Groups GetGroups() OVERRIDE;
-  virtual int GetGroupID(int row) OVERRIDE;
+  virtual int RowCount() override;
+  virtual base::string16 GetText(int row, int column) override;
+  virtual gfx::ImageSkia GetIcon(int row) override;
+  virtual void SetObserver(ui::TableModelObserver* observer) override;
+  virtual bool HasGroups() override;
+  virtual Groups GetGroups() override;
+  virtual int GetGroupID(int row) override;
 
   // Removes the entry at the specified index.
   void Remove(int index);
@@ -106,7 +106,7 @@ class TemplateURLTableModel : public ui::TableModel,
   void FaviconAvailable(ModelEntry* entry);
 
   // TemplateURLServiceObserver notification.
-  virtual void OnTemplateURLServiceChanged() OVERRIDE;
+  virtual void OnTemplateURLServiceChanged() override;
 
   // Removes the entry at |index| from |entries_| and returns the removed item.
   scoped_ptr<ModelEntry> RemoveEntry(int index);
diff --git a/chrome/browser/ui/settings_window_manager_browsertest.cc b/chrome/browser/ui/settings_window_manager_browsertest.cc
index d226e87..e3ed682 100644
--- a/chrome/browser/ui/settings_window_manager_browsertest.cc
+++ b/chrome/browser/ui/settings_window_manager_browsertest.cc
@@ -31,7 +31,7 @@ class SettingsWindowTestObserver
   SettingsWindowTestObserver() : browser_(NULL), new_settings_count_(0) {}
   virtual ~SettingsWindowTestObserver() {}
 
-  virtual void OnNewSettingsWindow(Browser* settings_browser) OVERRIDE {
+  virtual void OnNewSettingsWindow(Browser* settings_browser) override {
     browser_ = settings_browser;
     ++new_settings_count_;
   }
@@ -59,7 +59,7 @@ class SettingsWindowManagerTest : public InProcessBrowserTest {
     settings_manager_->RemoveObserver(&observer_);
   }
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     command_line->AppendSwitch(::switches::kEnableSettingsWindow);
   }
 
diff --git a/chrome/browser/ui/startup/autolaunch_prompt_win.cc b/chrome/browser/ui/startup/autolaunch_prompt_win.cc
index fc572411..dc73b29 100644
--- a/chrome/browser/ui/startup/autolaunch_prompt_win.cc
+++ b/chrome/browser/ui/startup/autolaunch_prompt_win.cc
@@ -47,13 +47,13 @@ class AutolaunchInfoBarDelegate : public ConfirmInfoBarDelegate {
   void set_should_expire() { should_expire_ = true; }
 
   // ConfirmInfoBarDelegate:
-  virtual int GetIconID() const OVERRIDE;
-  virtual base::string16 GetMessageText() const OVERRIDE;
-  virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
-  virtual bool Accept() OVERRIDE;
-  virtual bool Cancel() OVERRIDE;
+  virtual int GetIconID() const override;
+  virtual base::string16 GetMessageText() const override;
+  virtual base::string16 GetButtonLabel(InfoBarButton button) const override;
+  virtual bool Accept() override;
+  virtual bool Cancel() override;
   virtual bool ShouldExpireInternal(
-      const NavigationDetails& details) const OVERRIDE;
+      const NavigationDetails& details) const override;
 
   // Weak pointer to the profile, not owned by us.
   Profile* profile_;
diff --git a/chrome/browser/ui/startup/default_browser_prompt.cc b/chrome/browser/ui/startup/default_browser_prompt.cc
index 8c65daf..d3b49ae 100644
--- a/chrome/browser/ui/startup/default_browser_prompt.cc
+++ b/chrome/browser/ui/startup/default_browser_prompt.cc
@@ -73,14 +73,14 @@ class DefaultBrowserInfoBarDelegate : public ConfirmInfoBarDelegate {
   void AllowExpiry() { should_expire_ = true; }
 
   // ConfirmInfoBarDelegate:
-  virtual int GetIconID() const OVERRIDE;
-  virtual base::string16 GetMessageText() const OVERRIDE;
-  virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
-  virtual bool OKButtonTriggersUACPrompt() const OVERRIDE;
-  virtual bool Accept() OVERRIDE;
-  virtual bool Cancel() OVERRIDE;
+  virtual int GetIconID() const override;
+  virtual base::string16 GetMessageText() const override;
+  virtual base::string16 GetButtonLabel(InfoBarButton button) const override;
+  virtual bool OKButtonTriggersUACPrompt() const override;
+  virtual bool Accept() override;
+  virtual bool Cancel() override;
   virtual bool ShouldExpireInternal(
-      const NavigationDetails& details) const OVERRIDE;
+      const NavigationDetails& details) const override;
 
   // The prefs to use.
   PrefService* prefs_;
diff --git a/chrome/browser/ui/startup/default_browser_prompt_win.cc b/chrome/browser/ui/startup/default_browser_prompt_win.cc
index c7843e2..b4f6764 100644
--- a/chrome/browser/ui/startup/default_browser_prompt_win.cc
+++ b/chrome/browser/ui/startup/default_browser_prompt_win.cc
@@ -41,7 +41,7 @@ class SetMetroBrowserFlowLauncher : public content::NotificationObserver {
   // content::NotificationObserver override:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+                       const content::NotificationDetails& details) override;
 
   content::NotificationRegistrar registrar_;
   Profile* profile_;
diff --git a/chrome/browser/ui/startup/google_api_keys_infobar_delegate.h b/chrome/browser/ui/startup/google_api_keys_infobar_delegate.h
index 0025fca..37fdd09 100644
--- a/chrome/browser/ui/startup/google_api_keys_infobar_delegate.h
+++ b/chrome/browser/ui/startup/google_api_keys_infobar_delegate.h
@@ -23,10 +23,10 @@ class GoogleApiKeysInfoBarDelegate : public ConfirmInfoBarDelegate {
   GoogleApiKeysInfoBarDelegate();
   virtual ~GoogleApiKeysInfoBarDelegate();
 
-  virtual base::string16 GetMessageText() const OVERRIDE;
-  virtual int GetButtons() const OVERRIDE;
-  virtual base::string16 GetLinkText() const OVERRIDE;
-  virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
+  virtual base::string16 GetMessageText() const override;
+  virtual int GetButtons() const override;
+  virtual base::string16 GetLinkText() const override;
+  virtual bool LinkClicked(WindowOpenDisposition disposition) override;
 
   DISALLOW_COPY_AND_ASSIGN(GoogleApiKeysInfoBarDelegate);
 };
diff --git a/chrome/browser/ui/startup/obsolete_system_infobar_delegate.h b/chrome/browser/ui/startup/obsolete_system_infobar_delegate.h
index 3f234c0..dde2e65 100644
--- a/chrome/browser/ui/startup/obsolete_system_infobar_delegate.h
+++ b/chrome/browser/ui/startup/obsolete_system_infobar_delegate.h
@@ -24,10 +24,10 @@ class ObsoleteSystemInfoBarDelegate : public ConfirmInfoBarDelegate {
   ObsoleteSystemInfoBarDelegate();
   virtual ~ObsoleteSystemInfoBarDelegate();
 
-  virtual base::string16 GetMessageText() const OVERRIDE;
-  virtual int GetButtons() const OVERRIDE;
-  virtual base::string16 GetLinkText() const OVERRIDE;
-  virtual bool LinkClicked(WindowOpenDisposition disposition) OVERRIDE;
+  virtual base::string16 GetMessageText() const override;
+  virtual int GetButtons() const override;
+  virtual base::string16 GetLinkText() const override;
+  virtual bool LinkClicked(WindowOpenDisposition disposition) override;
 
   DISALLOW_COPY_AND_ASSIGN(ObsoleteSystemInfoBarDelegate);
 };
diff --git a/chrome/browser/ui/startup/session_crashed_infobar_delegate.h b/chrome/browser/ui/startup/session_crashed_infobar_delegate.h
index c800ad6e..b0521f8 100644
--- a/chrome/browser/ui/startup/session_crashed_infobar_delegate.h
+++ b/chrome/browser/ui/startup/session_crashed_infobar_delegate.h
@@ -22,11 +22,11 @@ class SessionCrashedInfoBarDelegate : public ConfirmInfoBarDelegate {
   virtual ~SessionCrashedInfoBarDelegate();
 
   // ConfirmInfoBarDelegate:
-  virtual int GetIconID() const OVERRIDE;
-  virtual base::string16 GetMessageText() const OVERRIDE;
-  virtual int GetButtons() const OVERRIDE;
-  virtual base::string16 GetButtonLabel(InfoBarButton button) const OVERRIDE;
-  virtual bool Accept() OVERRIDE;
+  virtual int GetIconID() const override;
+  virtual base::string16 GetMessageText() const override;
+  virtual int GetButtons() const override;
+  virtual base::string16 GetButtonLabel(InfoBarButton button) const override;
+  virtual bool Accept() override;
 
   bool accepted_;
   Profile* profile_;
diff --git a/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc b/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc
index 64486e8..caf16de 100644
--- a/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc
+++ b/chrome/browser/ui/startup/session_crashed_infobar_delegate_unittest.cc
@@ -20,7 +20,7 @@
 
 class SessionCrashedInfoBarDelegateUnitTest : public BrowserWithTestWindowTest {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     static_cast<TestingBrowserProcess*>(g_browser_process)
         ->SetLocalState(&pref_service);
     chrome::RegisterLocalState(pref_service.registry());
@@ -30,7 +30,7 @@ class SessionCrashedInfoBarDelegateUnitTest : public BrowserWithTestWindowTest {
     BrowserWithTestWindowTest::SetUp();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     static_cast<TestingBrowserProcess*>(g_browser_process)->SetLocalState(NULL);
     BrowserWithTestWindowTest::TearDown();
   }
diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc
index 4d5cdce..20f8cea 100644
--- a/chrome/browser/ui/startup/startup_browser_creator.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator.cc
@@ -114,7 +114,7 @@ class ProfileLaunchObserver : public content::NotificationObserver {
 
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE {
+                       const content::NotificationDetails& details) override {
     switch (type) {
       case chrome::NOTIFICATION_PROFILE_DESTROYED: {
         Profile* profile = content::Source<Profile>(source).ptr();
diff --git a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
index ad8eef8..8b137b1 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_browsertest.cc
@@ -89,11 +89,11 @@ Browser* FindOneOtherBrowser(Browser* browser) {
 
 class StartupBrowserCreatorTest : public ExtensionBrowserTest {
  protected:
-  virtual bool SetUpUserDataDirectory() OVERRIDE {
+  virtual bool SetUpUserDataDirectory() override {
     return ExtensionBrowserTest::SetUpUserDataDirectory();
   }
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     ExtensionBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kEnablePanels);
     command_line->AppendSwitchASCII(switches::kHomePage, url::kAboutBlankURL);
@@ -142,11 +142,11 @@ class OpenURLsPopupObserver : public chrome::BrowserListObserver {
  public:
   OpenURLsPopupObserver() : added_browser_(NULL) { }
 
-  virtual void OnBrowserAdded(Browser* browser) OVERRIDE {
+  virtual void OnBrowserAdded(Browser* browser) override {
     added_browser_ = browser;
   }
 
-  virtual void OnBrowserRemoved(Browser* browser) OVERRIDE { }
+  virtual void OnBrowserRemoved(Browser* browser) override { }
 
   Browser* added_browser_;
 };
@@ -1003,7 +1003,7 @@ IN_PROC_BROWSER_TEST_F(StartupBrowserCreatorTest, ProfilesLaunchedAfterCrash) {
 
 class SupervisedUserBrowserCreatorTest : public InProcessBrowserTest {
  protected:
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     InProcessBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitchASCII(switches::kSupervisedUserId, "asdf");
   }
@@ -1045,8 +1045,8 @@ IN_PROC_BROWSER_TEST_F(SupervisedUserBrowserCreatorTest,
 
 class StartupBrowserCreatorFirstRunTest : public InProcessBrowserTest {
  protected:
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
+  virtual void SetUpCommandLine(CommandLine* command_line) override;
+  virtual void SetUpInProcessBrowserTestFixture() override;
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
   policy::MockConfigurationPolicyProvider provider_;
diff --git a/chrome/browser/ui/startup/startup_browser_creator_impl.cc b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
index 0e150d0..80450bc 100644
--- a/chrome/browser/ui/startup/startup_browser_creator_impl.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator_impl.cc
@@ -263,7 +263,7 @@ class WebContentsCloseObserver : public content::NotificationObserver {
   // content::NotificationObserver overrides:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE {
+                       const content::NotificationDetails& details) override {
     DCHECK_EQ(type, content::NOTIFICATION_WEB_CONTENTS_DESTROYED);
     contents_ = NULL;
   }
diff --git a/chrome/browser/ui/sync/browser_synced_window_delegate.h b/chrome/browser/ui/sync/browser_synced_window_delegate.h
index f9d764b..8fd8ff1 100644
--- a/chrome/browser/ui/sync/browser_synced_window_delegate.h
+++ b/chrome/browser/ui/sync/browser_synced_window_delegate.h
@@ -23,18 +23,18 @@ class BrowserSyncedWindowDelegate : public browser_sync::SyncedWindowDelegate {
   virtual ~BrowserSyncedWindowDelegate();
 
   // SyncedWindowDelegate:
-  virtual bool HasWindow() const OVERRIDE;
-  virtual SessionID::id_type GetSessionId() const OVERRIDE;
-  virtual int GetTabCount() const OVERRIDE;
-  virtual int GetActiveIndex() const OVERRIDE;
-  virtual bool IsApp() const OVERRIDE;
-  virtual bool IsTypeTabbed() const OVERRIDE;
-  virtual bool IsTypePopup() const OVERRIDE;
+  virtual bool HasWindow() const override;
+  virtual SessionID::id_type GetSessionId() const override;
+  virtual int GetTabCount() const override;
+  virtual int GetActiveIndex() const override;
+  virtual bool IsApp() const override;
+  virtual bool IsTypeTabbed() const override;
+  virtual bool IsTypePopup() const override;
   virtual bool IsTabPinned(
-      const browser_sync::SyncedTabDelegate* tab) const OVERRIDE;
-  virtual browser_sync::SyncedTabDelegate* GetTabAt(int index) const OVERRIDE;
-  virtual SessionID::id_type GetTabIdAt(int index) const OVERRIDE;
-  virtual bool IsSessionRestoreInProgress() const OVERRIDE;
+      const browser_sync::SyncedTabDelegate* tab) const override;
+  virtual browser_sync::SyncedTabDelegate* GetTabAt(int index) const override;
+  virtual SessionID::id_type GetTabIdAt(int index) const override;
+  virtual bool IsSessionRestoreInProgress() const override;
 
  private:
   Browser* browser_;
diff --git a/chrome/browser/ui/sync/inline_login_dialog.h b/chrome/browser/ui/sync/inline_login_dialog.h
index 00fcd6c..319f862 100644
--- a/chrome/browser/ui/sync/inline_login_dialog.h
+++ b/chrome/browser/ui/sync/inline_login_dialog.h
@@ -25,19 +25,19 @@ class InlineLoginDialog : public ui::WebDialogDelegate {
   explicit InlineLoginDialog(Profile* profile);
 
   // ui::WebDialogDelegate overrides:
-  virtual ui::ModalType GetDialogModalType() const OVERRIDE;
-  virtual base::string16 GetDialogTitle() const OVERRIDE;
-  virtual GURL GetDialogContentURL() const OVERRIDE;
+  virtual ui::ModalType GetDialogModalType() const override;
+  virtual base::string16 GetDialogTitle() const override;
+  virtual GURL GetDialogContentURL() const override;
   virtual void GetWebUIMessageHandlers(
-      std::vector<content::WebUIMessageHandler*>* handlers) const OVERRIDE;
-  virtual void GetDialogSize(gfx::Size* size) const OVERRIDE;
-  virtual std::string GetDialogArgs() const OVERRIDE;
-  virtual void OnDialogClosed(const std::string& json_retval) OVERRIDE;
+      std::vector<content::WebUIMessageHandler*>* handlers) const override;
+  virtual void GetDialogSize(gfx::Size* size) const override;
+  virtual std::string GetDialogArgs() const override;
+  virtual void OnDialogClosed(const std::string& json_retval) override;
   virtual void OnCloseContents(
-      content::WebContents* source, bool* out_close_dialog) OVERRIDE;
-  virtual bool ShouldShowDialogTitle() const OVERRIDE;
+      content::WebContents* source, bool* out_close_dialog) override;
+  virtual bool ShouldShowDialogTitle() const override;
   virtual bool HandleContextMenu(
-      const content::ContextMenuParams& params) OVERRIDE;
+      const content::ContextMenuParams& params) override;
 
   Profile* profile_;
 
diff --git a/chrome/browser/ui/sync/one_click_signin_bubble_links_delegate.h b/chrome/browser/ui/sync/one_click_signin_bubble_links_delegate.h
index e306709..04dde37 100644
--- a/chrome/browser/ui/sync/one_click_signin_bubble_links_delegate.h
+++ b/chrome/browser/ui/sync/one_click_signin_bubble_links_delegate.h
@@ -19,8 +19,8 @@ class OneClickSigninBubbleLinksDelegate : public OneClickSigninBubbleDelegate {
 
  private:
   // OneClickSigninBubbleDelegate:
-  virtual void OnLearnMoreLinkClicked(bool is_dialog) OVERRIDE;
-  virtual void OnAdvancedLinkClicked() OVERRIDE;
+  virtual void OnLearnMoreLinkClicked(bool is_dialog) override;
+  virtual void OnAdvancedLinkClicked() override;
 
   // Browser in which the links should be opened.
   Browser* browser_;
diff --git a/chrome/browser/ui/sync/one_click_signin_helper.cc b/chrome/browser/ui/sync/one_click_signin_helper.cc
index a3d619f..b4341f0 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper.cc
+++ b/chrome/browser/ui/sync/one_click_signin_helper.cc
@@ -120,15 +120,15 @@ class ConfirmEmailDialogDelegate : public TabModalConfirmDialogDelegate {
   virtual ~ConfirmEmailDialogDelegate();
 
   // TabModalConfirmDialogDelegate:
-  virtual base::string16 GetTitle() OVERRIDE;
-  virtual base::string16 GetDialogMessage() OVERRIDE;
-  virtual base::string16 GetAcceptButtonTitle() OVERRIDE;
-  virtual base::string16 GetCancelButtonTitle() OVERRIDE;
-  virtual base::string16 GetLinkText() const OVERRIDE;
-  virtual void OnAccepted() OVERRIDE;
-  virtual void OnCanceled() OVERRIDE;
-  virtual void OnClosed() OVERRIDE;
-  virtual void OnLinkClicked(WindowOpenDisposition disposition) OVERRIDE;
+  virtual base::string16 GetTitle() override;
+  virtual base::string16 GetDialogMessage() override;
+  virtual base::string16 GetAcceptButtonTitle() override;
+  virtual base::string16 GetCancelButtonTitle() override;
+  virtual base::string16 GetLinkText() const override;
+  virtual void OnAccepted() override;
+  virtual void OnCanceled() override;
+  virtual void OnClosed() override;
+  virtual void OnLinkClicked(WindowOpenDisposition disposition) override;
 
   std::string last_email_;
   std::string email_;
@@ -432,11 +432,11 @@ class CurrentHistoryCleaner : public content::WebContentsObserver {
   virtual ~CurrentHistoryCleaner();
 
   // content::WebContentsObserver:
-  virtual void WebContentsDestroyed() OVERRIDE;
+  virtual void WebContentsDestroyed() override;
   virtual void DidCommitProvisionalLoadForFrame(
       content::RenderFrameHost* render_frame_host,
       const GURL& url,
-      ui::PageTransition transition_type) OVERRIDE;
+      ui::PageTransition transition_type) override;
 
  private:
   scoped_ptr<content::WebContents> contents_;
diff --git a/chrome/browser/ui/sync/one_click_signin_helper.h b/chrome/browser/ui/sync/one_click_signin_helper.h
index d2e3a63..90c448f 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper.h
+++ b/chrome/browser/ui/sync/one_click_signin_helper.h
@@ -153,12 +153,12 @@ class OneClickSigninHelper
     virtual void OnSigninOAuthInformationAvailable(
         const std::string& email,
         const std::string& display_email,
-        const std::string& refresh_token) OVERRIDE;
+        const std::string& refresh_token) override;
     virtual void OnSigninOAuthInformationFailure(
-        const GoogleServiceAuthError& error) OVERRIDE;
+        const GoogleServiceAuthError& error) override;
 
     // Overriden from chrome::BrowserListObserver.
-    virtual void OnBrowserRemoved(Browser* browser) OVERRIDE;
+    virtual void OnBrowserRemoved(Browser* browser) override;
 
     OneClickSigninHelper::StartSyncArgs args_;
     chrome::HostDesktopType desktop_type_;
@@ -334,12 +334,12 @@ class OneClickSigninHelper
   // content::WebContentsObserver overrides.
   virtual void DidStartNavigationToPendingEntry(
       const GURL& url,
-      content::NavigationController::ReloadType reload_type) OVERRIDE;
+      content::NavigationController::ReloadType reload_type) override;
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
-      const content::FrameNavigateParams& params) OVERRIDE;
+      const content::FrameNavigateParams& params) override;
   virtual void DidStopLoading(
-      content::RenderViewHost* render_view_host) OVERRIDE;
+      content::RenderViewHost* render_view_host) override;
 
   OneClickSigninSyncStarter::Callback CreateSyncStarterCallback();
 
diff --git a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
index bf982c3..812131e 100644
--- a/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
+++ b/chrome/browser/ui/sync/one_click_signin_helper_unittest.cc
@@ -115,11 +115,11 @@ class TestProfileIOData : public ProfileIOData {
       ProfileParams* profile_params,
       content::ProtocolHandlerMap* protocol_handlers,
       content::URLRequestInterceptorScopedVector request_interceptors)
-      const OVERRIDE {
+      const override {
     NOTREACHED();
   }
   virtual void InitializeExtensionsRequestContext(
-      ProfileParams* profile_params) const OVERRIDE {
+      ProfileParams* profile_params) const override {
     NOTREACHED();
   }
   virtual net::URLRequestContext* InitializeAppRequestContext(
@@ -129,18 +129,18 @@ class TestProfileIOData : public ProfileIOData {
           protocol_handler_interceptor,
       content::ProtocolHandlerMap* protocol_handlers,
       content::URLRequestInterceptorScopedVector request_interceptors)
-      const OVERRIDE {
+      const override {
     NOTREACHED();
     return NULL;
   }
   virtual net::URLRequestContext* InitializeMediaRequestContext(
       net::URLRequestContext* original_context,
-      const StoragePartitionDescriptor& details) const OVERRIDE {
+      const StoragePartitionDescriptor& details) const override {
     NOTREACHED();
     return NULL;
   }
   virtual net::URLRequestContext*
-      AcquireMediaRequestContext() const OVERRIDE {
+      AcquireMediaRequestContext() const override {
     NOTREACHED();
     return NULL;
   }
@@ -151,7 +151,7 @@ class TestProfileIOData : public ProfileIOData {
           protocol_handler_interceptor,
       content::ProtocolHandlerMap* protocol_handlers,
       content::URLRequestInterceptorScopedVector request_interceptors)
-      const OVERRIDE {
+      const override {
     NOTREACHED();
     return NULL;
   }
@@ -159,7 +159,7 @@ class TestProfileIOData : public ProfileIOData {
       AcquireIsolatedMediaRequestContext(
           net::URLRequestContext* app_context,
           const StoragePartitionDescriptor& partition_descriptor)
-          const OVERRIDE {
+          const override {
     NOTREACHED();
     return NULL;
   }
@@ -182,11 +182,11 @@ class OneClickTestProfileSyncService : public TestProfileSyncService {
   }
 
   // Need to control this for certain tests.
-  virtual bool FirstSetupInProgress() const OVERRIDE {
+  virtual bool FirstSetupInProgress() const override {
     return first_setup_in_progress_;
   }
 
-  virtual bool sync_initialized() const OVERRIDE { return sync_initialized_; }
+  virtual bool sync_initialized() const override { return sync_initialized_; }
 
   // Controls return value of FirstSetupInProgress. Because some bits
   // of UI depend on that value, it's useful to control it separately
@@ -222,8 +222,8 @@ class OneClickSigninHelperTest : public ChromeRenderViewHostTestHarness {
  public:
   OneClickSigninHelperTest();
 
-  virtual void SetUp() OVERRIDE;
-  virtual void TearDown() OVERRIDE;
+  virtual void SetUp() override;
+  virtual void TearDown() override;
 
   // Sets up the sign-in manager for tests.  If |username| is
   // is not empty, the profile of the mock WebContents will be connected to
@@ -248,7 +248,7 @@ class OneClickSigninHelperTest : public ChromeRenderViewHostTestHarness {
 
  private:
   // ChromeRenderViewHostTestHarness overrides:
-  virtual content::BrowserContext* CreateBrowserContext() OVERRIDE;
+  virtual content::BrowserContext* CreateBrowserContext() override;
 
   // The ID of the signin process the test will assume to be trusted.
   // By default, set to the test RenderProcessHost's process ID, but
@@ -348,7 +348,7 @@ class OneClickSigninHelperIOTest : public OneClickSigninHelperTest {
  public:
   OneClickSigninHelperIOTest();
 
-  virtual void SetUp() OVERRIDE;
+  virtual void SetUp() override;
 
   TestProfileIOData* CreateTestProfileIOData(Profile::ProfileType profile_type);
 
@@ -387,7 +387,7 @@ TestProfileIOData* OneClickSigninHelperIOTest::CreateTestProfileIOData(
 class OneClickSigninHelperIncognitoTest : public OneClickSigninHelperTest {
  protected:
   // content::RenderViewHostTestHarness.
-  virtual content::BrowserContext* CreateBrowserContext() OVERRIDE;
+  virtual content::BrowserContext* CreateBrowserContext() override;
 };
 
 content::BrowserContext*
@@ -862,12 +862,12 @@ MockStarterWrapper::MockStarterWrapper(
 
 class OneClickSyncStarterWrapperTest : public testing::Test {
  public:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     TestingProfile::Builder builder;
     profile_ = builder.Build();
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // Let the SyncStarterWrapper delete itself.
     base::RunLoop().RunUntilIdle();
   }
diff --git a/chrome/browser/ui/sync/one_click_signin_sync_observer.h b/chrome/browser/ui/sync/one_click_signin_sync_observer.h
index 23dca83..8177ecd 100644
--- a/chrome/browser/ui/sync/one_click_signin_sync_observer.h
+++ b/chrome/browser/ui/sync/one_click_signin_sync_observer.h
@@ -31,10 +31,10 @@ class OneClickSigninSyncObserver : public content::WebContentsObserver,
 
  private:
   // content::WebContentsObserver:
-  virtual void WebContentsDestroyed() OVERRIDE;
+  virtual void WebContentsDestroyed() override;
 
   // ProfileSyncServiceObserver:
-  virtual void OnStateChanged() OVERRIDE;
+  virtual void OnStateChanged() override;
 
   // Loads the |continue_url_| in the |web_contents()|.
   void LoadContinueUrl();
diff --git a/chrome/browser/ui/sync/one_click_signin_sync_observer_unittest.cc b/chrome/browser/ui/sync/one_click_signin_sync_observer_unittest.cc
index 5b7750a..178535e 100644
--- a/chrome/browser/ui/sync/one_click_signin_sync_observer_unittest.cc
+++ b/chrome/browser/ui/sync/one_click_signin_sync_observer_unittest.cc
@@ -51,11 +51,11 @@ class OneClickTestProfileSyncService : public TestProfileSyncService {
     return new OneClickTestProfileSyncService(static_cast<Profile*>(profile));
   }
 
-  virtual bool FirstSetupInProgress() const OVERRIDE {
+  virtual bool FirstSetupInProgress() const override {
     return first_setup_in_progress_;
   }
 
-  virtual bool sync_initialized() const OVERRIDE { return sync_initialized_; }
+  virtual bool sync_initialized() const override { return sync_initialized_; }
 
   void set_first_setup_in_progress(bool in_progress) {
     first_setup_in_progress_ = in_progress;
@@ -113,7 +113,7 @@ class OneClickSigninSyncObserverTest : public ChromeRenderViewHostTestHarness {
         sync_observer_(NULL),
         sync_observer_destroyed_(true) {}
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
     web_contents_observer_.reset(new MockWebContentsObserver(web_contents()));
     sync_service_ =
@@ -122,7 +122,7 @@ class OneClickSigninSyncObserverTest : public ChromeRenderViewHostTestHarness {
                 profile(), OneClickTestProfileSyncService::Build));
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // Verify that the |sync_observer_| unregistered as an observer from the
     // sync service and freed its memory.
     EXPECT_TRUE(sync_observer_destroyed_);
diff --git a/chrome/browser/ui/sync/one_click_signin_sync_starter.h b/chrome/browser/ui/sync/one_click_signin_sync_starter.h
index 9b09dbe..c7348df 100644
--- a/chrome/browser/ui/sync/one_click_signin_sync_starter.h
+++ b/chrome/browser/ui/sync/one_click_signin_sync_starter.h
@@ -104,7 +104,7 @@ class OneClickSigninSyncStarter : public SigninTracker::Observer,
                             Callback callback);
 
   // chrome::BrowserListObserver override.
-  virtual void OnBrowserRemoved(Browser* browser) OVERRIDE;
+  virtual void OnBrowserRemoved(Browser* browser) override;
 
   // If the |browser| argument is non-null, returns the pointer directly.
   // Otherwise creates a new browser for the given profile on the given
@@ -126,13 +126,13 @@ class OneClickSigninSyncStarter : public SigninTracker::Observer,
   void Initialize(Profile* profile, Browser* browser);
 
   // SigninTracker::Observer override.
-  virtual void SigninFailed(const GoogleServiceAuthError& error) OVERRIDE;
-  virtual void SigninSuccess() OVERRIDE;
+  virtual void SigninFailed(const GoogleServiceAuthError& error) override;
+  virtual void SigninSuccess() override;
   virtual void MergeSessionComplete(
-      const GoogleServiceAuthError& error) OVERRIDE;
+      const GoogleServiceAuthError& error) override;
 
   // LoginUIService::Observer override.
-  virtual void OnSyncConfirmationUIClosed(bool configure_sync_first) OVERRIDE;
+  virtual void OnSyncConfirmationUIClosed(bool configure_sync_first) override;
 
 #if defined(ENABLE_CONFIGURATION_POLICY)
   // User input handler for the signin confirmation dialog.
@@ -142,9 +142,9 @@ class OneClickSigninSyncStarter : public SigninTracker::Observer,
     SigninDialogDelegate(
         base::WeakPtr<OneClickSigninSyncStarter> sync_starter);
     virtual ~SigninDialogDelegate();
-    virtual void OnCancelSignin() OVERRIDE;
-    virtual void OnContinueSignin() OVERRIDE;
-    virtual void OnSigninWithNewProfile() OVERRIDE;
+    virtual void OnCancelSignin() override;
+    virtual void OnContinueSignin() override;
+    virtual void OnSigninWithNewProfile() override;
    private:
     base::WeakPtr<OneClickSigninSyncStarter> sync_starter_;
   };
diff --git a/chrome/browser/ui/sync/one_click_signin_sync_starter_unittest.cc b/chrome/browser/ui/sync/one_click_signin_sync_starter_unittest.cc
index 9dd7773..8629182 100644
--- a/chrome/browser/ui/sync/one_click_signin_sync_starter_unittest.cc
+++ b/chrome/browser/ui/sync/one_click_signin_sync_starter_unittest.cc
@@ -30,7 +30,7 @@ class OneClickSigninSyncStarterTest : public ChromeRenderViewHostTestHarness {
         succeeded_count_(0) {}
 
   // ChromeRenderViewHostTestHarness:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
 
     // Disable sync to simplify the creation of a OneClickSigninSyncStarter.
@@ -51,7 +51,7 @@ class OneClickSigninSyncStarterTest : public ChromeRenderViewHostTestHarness {
   }
 
   // ChromeRenderViewHostTestHarness:
-  virtual content::BrowserContext* CreateBrowserContext() OVERRIDE {
+  virtual content::BrowserContext* CreateBrowserContext() override {
     // Create the sign in manager required by OneClickSigninSyncStarter.
     TestingProfile::Builder builder;
     builder.AddTestingFactory(
diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc
index 2852608..5d6debd 100644
--- a/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc
+++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper.cc
@@ -43,7 +43,7 @@ class HasTypedURLsTask : public history::HistoryDBTask {
   }
 
   virtual bool RunOnDBThread(history::HistoryBackend* backend,
-                             history::HistoryDatabase* db) OVERRIDE {
+                             history::HistoryDatabase* db) override {
     history::URLRows rows;
     backend->GetAllTypedURLs(&rows);
     if (!rows.empty()) {
@@ -54,7 +54,7 @@ class HasTypedURLsTask : public history::HistoryDBTask {
     return true;
   }
 
-  virtual void DoneRunOnMainThread() OVERRIDE {
+  virtual void DoneRunOnMainThread() override {
     cb_.Run(has_typed_urls_);
   }
 
diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc
index 73465cd..78f160a 100644
--- a/chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc
+++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper_browsertest.cc
@@ -18,7 +18,7 @@ class ProfileSigninConfirmationHelperBrowserTest : public InProcessBrowserTest {
  public:
   ProfileSigninConfirmationHelperBrowserTest() {}
 
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+  virtual void SetUpCommandLine(CommandLine* command_line) override {
     // Force the first-run flow to trigger autoimport.
     InProcessBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kForceFirstRun);
diff --git a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
index 62d926c..9b972b6 100644
--- a/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
+++ b/chrome/browser/ui/sync/profile_signin_confirmation_helper_unittest.cc
@@ -76,10 +76,10 @@ class TestingPrefStoreWithCustomReadError : public TestingPrefStore {
     // By default the profile is "new" (NO_FILE means that the profile
     // wasn't found on disk, so it was created).
   }
-  virtual PrefReadError GetReadError() const OVERRIDE {
+  virtual PrefReadError GetReadError() const override {
     return read_error_;
   }
-  virtual bool IsInitializationComplete() const OVERRIDE {
+  virtual bool IsInitializationComplete() const override {
     return true;
   }
   void set_read_error(PrefReadError read_error) {
@@ -127,7 +127,7 @@ class ProfileSigninConfirmationHelperTest : public testing::Test {
         model_(NULL) {
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     // Create the profile.
     TestingProfile::Builder builder;
     user_prefs_ = new TestingPrefStoreWithCustomReadError;
@@ -157,7 +157,7 @@ class ProfileSigninConfirmationHelperTest : public testing::Test {
 #endif
   }
 
-  virtual void TearDown() OVERRIDE {
+  virtual void TearDown() override {
     // TestExtensionSystem uses DeleteSoon, so we need to delete the profile
     // and then run the message queue to clean up.
     profile_.reset();
diff --git a/chrome/browser/ui/sync/sync_promo_ui_unittest.cc b/chrome/browser/ui/sync/sync_promo_ui_unittest.cc
index f4ea003..cbf6f54 100644
--- a/chrome/browser/ui/sync/sync_promo_ui_unittest.cc
+++ b/chrome/browser/ui/sync/sync_promo_ui_unittest.cc
@@ -19,7 +19,7 @@ class SyncPromoUITest : public testing::Test {
   SyncPromoUITest() {}
 
   // testing::Test:
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     testing::Test::SetUp();
     TestingProfile::Builder builder;
     builder.AddTestingFactory(SigninManagerFactory::GetInstance(),
diff --git a/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h b/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h
index 521c7b6..e2e8a51 100644
--- a/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h
+++ b/chrome/browser/ui/sync/tab_contents_synced_tab_delegate.h
@@ -21,25 +21,25 @@ class TabContentsSyncedTabDelegate
   virtual ~TabContentsSyncedTabDelegate();
 
   // Methods from SyncedTabDelegate.
-  virtual SessionID::id_type GetWindowId() const OVERRIDE;
-  virtual SessionID::id_type GetSessionId() const OVERRIDE;
-  virtual bool IsBeingDestroyed() const OVERRIDE;
-  virtual Profile* profile() const OVERRIDE;
-  virtual std::string GetExtensionAppId() const OVERRIDE;
-  virtual int GetCurrentEntryIndex() const OVERRIDE;
-  virtual int GetEntryCount() const OVERRIDE;
-  virtual int GetPendingEntryIndex() const OVERRIDE;
-  virtual content::NavigationEntry* GetPendingEntry() const OVERRIDE;
-  virtual content::NavigationEntry* GetEntryAtIndex(int i) const OVERRIDE;
-  virtual content::NavigationEntry* GetActiveEntry() const OVERRIDE;
-  virtual bool ProfileIsSupervised() const OVERRIDE;
+  virtual SessionID::id_type GetWindowId() const override;
+  virtual SessionID::id_type GetSessionId() const override;
+  virtual bool IsBeingDestroyed() const override;
+  virtual Profile* profile() const override;
+  virtual std::string GetExtensionAppId() const override;
+  virtual int GetCurrentEntryIndex() const override;
+  virtual int GetEntryCount() const override;
+  virtual int GetPendingEntryIndex() const override;
+  virtual content::NavigationEntry* GetPendingEntry() const override;
+  virtual content::NavigationEntry* GetEntryAtIndex(int i) const override;
+  virtual content::NavigationEntry* GetActiveEntry() const override;
+  virtual bool ProfileIsSupervised() const override;
   virtual const std::vector<const content::NavigationEntry*>*
-      GetBlockedNavigations() const OVERRIDE;
-  virtual bool IsPinned() const OVERRIDE;
-  virtual bool HasWebContents() const OVERRIDE;
-  virtual content::WebContents* GetWebContents() const OVERRIDE;
-  virtual int GetSyncId() const OVERRIDE;
-  virtual void SetSyncId(int sync_id) OVERRIDE;
+      GetBlockedNavigations() const override;
+  virtual bool IsPinned() const override;
+  virtual bool HasWebContents() const override;
+  virtual content::WebContents* GetWebContents() const override;
+  virtual int GetSyncId() const override;
+  virtual void SetSyncId(int sync_id) override;
 
  private:
   explicit TabContentsSyncedTabDelegate(content::WebContents* web_contents);