Remove obsolete TODO and add a bunch of OVERRIDEs.

R=aa@chromium.org


Review URL: http://codereview.chromium.org/7806009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99070 0039d316-1c4b-4281-b951-d872f2087c98

34 files changed, 161 insertions, 129 deletions

diff --git a/chrome/browser/extensions/crx_installer.h b/chrome/browser/extensions/crx_installer.h
index 52d6248..23ea41a 100644
--- a/chrome/browser/extensions/crx_installer.h
+++ b/chrome/browser/extensions/crx_installer.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
@@ -107,8 +108,8 @@ class CrxInstaller
   void InstallWebApp(const WebApplicationInfo& web_app);
 
   // Overridden from ExtensionInstallUI::Delegate:
-  virtual void InstallUIProceed();
-  virtual void InstallUIAbort(bool user_initiated);
+  virtual void InstallUIProceed() OVERRIDE;
+  virtual void InstallUIAbort(bool user_initiated) OVERRIDE;
 
   const GURL& original_url() const { return original_url_; }
   void set_original_url(const GURL& val) { original_url_ = val; }
@@ -173,11 +174,11 @@ class CrxInstaller
   bool AllowInstall(const Extension* extension, std::string* error);
 
   // SandboxedExtensionUnpackerClient
-  virtual void OnUnpackFailure(const std::string& error_message);
+  virtual void OnUnpackFailure(const std::string& error_message) OVERRIDE;
   virtual void OnUnpackSuccess(const FilePath& temp_dir,
                                const FilePath& extension_dir,
                                const base::DictionaryValue* original_manifest,
-                               const Extension* extension);
+                               const Extension* extension) OVERRIDE;
 
   // Returns true if we can skip confirmation because the install was
   // whitelisted.
diff --git a/chrome/browser/extensions/extension_accessibility_api.h b/chrome/browser/extensions/extension_accessibility_api.h
index 3eea2b9..d5dafcd 100644
--- a/chrome/browser/extensions/extension_accessibility_api.h
+++ b/chrome/browser/extensions/extension_accessibility_api.h
@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "base/callback_old.h"
+#include "base/compiler_specific.h"
 #include "base/memory/singleton.h"
 #include "base/values.h"
 #include "chrome/browser/accessibility_events.h"
@@ -53,7 +54,7 @@ class ExtensionAccessibilityEventRouter : public NotificationObserver {
   // NotificationObserver::Observe.
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
 
   void OnWindowOpened(const AccessibilityWindowInfo* details);
   void OnWindowClosed(const AccessibilityWindowInfo* details);
@@ -85,7 +86,7 @@ class ExtensionAccessibilityEventRouter : public NotificationObserver {
 // minimize the impact.
 class SetAccessibilityEnabledFunction : public SyncExtensionFunction {
   virtual ~SetAccessibilityEnabledFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME(
       "experimental.accessibility.setAccessibilityEnabled")
 };
@@ -93,7 +94,7 @@ class SetAccessibilityEnabledFunction : public SyncExtensionFunction {
 // API function that returns the most recent focused control.
 class GetFocusedControlFunction : public SyncExtensionFunction {
   virtual ~GetFocusedControlFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME(
       "experimental.accessibility.getFocusedControl")
 };
diff --git a/chrome/browser/extensions/extension_apitest.h b/chrome/browser/extensions/extension_apitest.h
index aac6727..bc0465e 100644
--- a/chrome/browser/extensions/extension_apitest.h
+++ b/chrome/browser/extensions/extension_apitest.h
@@ -9,6 +9,7 @@
 #include <deque>
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "content/common/notification_registrar.h"
@@ -51,7 +52,7 @@ class ExtensionApiTest : public ExtensionBrowserTest {
    private:
     virtual void Observe(int type,
                          const NotificationSource& source,
-                         const NotificationDetails& details);
+                         const NotificationDetails& details) OVERRIDE;
 
     NotificationRegistrar registrar_;
 
@@ -70,8 +71,8 @@ class ExtensionApiTest : public ExtensionBrowserTest {
     bool waiting_;
   };
 
-  virtual void SetUpInProcessBrowserTestFixture();
-  virtual void TearDownInProcessBrowserTestFixture();
+  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE;
+  virtual void TearDownInProcessBrowserTestFixture() OVERRIDE;
 
   // Load |extension_name| and wait for pass / fail notification.
   // |extension_name| is a directory in "test/data/extensions/api_test".
@@ -114,7 +115,7 @@ class ExtensionApiTest : public ExtensionBrowserTest {
   const Extension* GetSingleLoadedExtension();
 
   // All extensions tested by ExtensionApiTest are in the "api_test" dir.
-  virtual void SetUpCommandLine(CommandLine* command_line);
+  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE;
 
   // If it failed, what was the error message?
   std::string message_;
diff --git a/chrome/browser/extensions/extension_browser_event_router.h b/chrome/browser/extensions/extension_browser_event_router.h
index ddd878b..08e37a4 100644
--- a/chrome/browser/extensions/extension_browser_event_router.h
+++ b/chrome/browser/extensions/extension_browser_event_router.h
@@ -10,6 +10,7 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "chrome/browser/extensions/extension_tabs_module.h"
 #include "chrome/browser/tabs/tab_strip_model_observer.h"
 #include "chrome/browser/ui/browser_list.h"
@@ -42,15 +43,15 @@ class ExtensionBrowserEventRouter : public TabStripModelObserver,
   void Init();
 
   // BrowserList::Observer
-  virtual void OnBrowserAdded(const Browser* browser);
-  virtual void OnBrowserRemoved(const Browser* browser);
-  virtual void OnBrowserSetLastActive(const Browser* browser);
+  virtual void OnBrowserAdded(const Browser* browser) OVERRIDE;
+  virtual void OnBrowserRemoved(const Browser* browser) OVERRIDE;
+  virtual void OnBrowserSetLastActive(const Browser* browser) OVERRIDE;
 
 #if defined(TOOLKIT_VIEWS)
   virtual void NativeFocusWillChange(gfx::NativeView focused_before,
-                                     gfx::NativeView focused_now);
+                                     gfx::NativeView focused_now) OVERRIDE;
 #elif defined(TOOLKIT_GTK)
-  virtual void ActiveWindowChanged(GdkWindow* active_window);
+  virtual void ActiveWindowChanged(GdkWindow* active_window) OVERRIDE;
 #endif
 
   // Called from Observe() on BROWSER_WINDOW_READY (not a part of
@@ -59,25 +60,26 @@ class ExtensionBrowserEventRouter : public TabStripModelObserver,
 
   // TabStripModelObserver
   virtual void TabInsertedAt(TabContentsWrapper* contents, int index,
-                             bool active);
+                             bool active) OVERRIDE;
   virtual void TabClosingAt(TabStripModel* tab_strip_model,
                             TabContentsWrapper* contents,
-                            int index);
-  virtual void TabDetachedAt(TabContentsWrapper* contents, int index);
+                            int index) OVERRIDE;
+  virtual void TabDetachedAt(TabContentsWrapper* contents, int index) OVERRIDE;
   virtual void ActiveTabChanged(TabContentsWrapper* old_contents,
                                 TabContentsWrapper* new_contents,
                                 int index,
-                                bool user_gesture);
+                                bool user_gesture) OVERRIDE;
   virtual void TabMoved(TabContentsWrapper* contents, int from_index,
-                        int to_index);
+                        int to_index) OVERRIDE;
   virtual void TabChangedAt(TabContentsWrapper* contents, int index,
-                            TabChangeType change_type);
+                            TabChangeType change_type) OVERRIDE;
   virtual void TabReplacedAt(TabStripModel* tab_strip_model,
                              TabContentsWrapper* old_contents,
                              TabContentsWrapper* new_contents,
-                             int index);
-  virtual void TabPinnedStateChanged(TabContentsWrapper* contents, int index);
-  virtual void TabStripEmpty();
+                             int index) OVERRIDE;
+  virtual void TabPinnedStateChanged(TabContentsWrapper* contents,
+                                     int index) OVERRIDE;
+  virtual void TabStripEmpty() OVERRIDE;
 
   // Page Action execute event.
   void PageActionExecuted(Profile* profile,
@@ -94,7 +96,7 @@ class ExtensionBrowserEventRouter : public TabStripModelObserver,
   // NotificationObserver.
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
  private:
   // "Synthetic" event. Called from TabInsertedAt if new tab is detected.
   void TabCreatedAt(TabContents* contents, int index, bool active);
diff --git a/chrome/browser/extensions/extension_browsertest.h b/chrome/browser/extensions/extension_browsertest.h
index 02ff5c3..96a9539 100644
--- a/chrome/browser/extensions/extension_browsertest.h
+++ b/chrome/browser/extensions/extension_browsertest.h
@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/command_line.h"
+#include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/scoped_temp_dir.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ -114,7 +115,7 @@ class ExtensionBrowserTest
   // NotificationObserver
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
 
   bool loaded_;
   bool installed_;
diff --git a/chrome/browser/extensions/extension_cookies_api.h b/chrome/browser/extensions/extension_cookies_api.h
index 33d1a30..8266265 100644
--- a/chrome/browser/extensions/extension_cookies_api.h
+++ b/chrome/browser/extensions/extension_cookies_api.h
@@ -11,6 +11,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/time.h"
 #include "chrome/browser/extensions/extension_function.h"
@@ -41,7 +42,7 @@ class ExtensionCookiesEventRouter : public NotificationObserver {
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
 
   // Handler for the COOKIE_CHANGED event. The method takes the details of such
   // an event and constructs a suitable JSON formatted extension event from it.
@@ -96,7 +97,7 @@ class GetCookieFunction : public CookiesFunction {
  public:
   GetCookieFunction();
   virtual ~GetCookieFunction();
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("cookies.get")
 
  private:
@@ -115,7 +116,7 @@ class GetAllCookiesFunction : public CookiesFunction {
  public:
   GetAllCookiesFunction();
   virtual ~GetAllCookiesFunction();
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("cookies.getAll")
 
  private:
@@ -134,7 +135,7 @@ class SetCookieFunction : public CookiesFunction {
  public:
   SetCookieFunction();
   virtual ~SetCookieFunction();
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("cookies.set")
 
  private:
@@ -161,7 +162,7 @@ class RemoveCookieFunction : public CookiesFunction {
  public:
   RemoveCookieFunction();
   virtual ~RemoveCookieFunction();
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("cookies.remove")
 
  private:
@@ -179,7 +180,7 @@ class RemoveCookieFunction : public CookiesFunction {
 // Implements the cookies.getAllCookieStores() extension function.
 class GetAllCookieStoresFunction : public CookiesFunction {
  public:
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   // GetAllCookieStoresFunction is sync.
   virtual void Run();
   DECLARE_EXTENSION_FUNCTION_NAME("cookies.getAllCookieStores")
diff --git a/chrome/browser/extensions/extension_disabled_infobar_delegate.cc b/chrome/browser/extensions/extension_disabled_infobar_delegate.cc
index 6dbd444..e457f6d 100644
--- a/chrome/browser/extensions/extension_disabled_infobar_delegate.cc
+++ b/chrome/browser/extensions/extension_disabled_infobar_delegate.cc
@@ -6,6 +6,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ -38,8 +39,8 @@ class ExtensionDisabledDialogDelegate
   virtual ~ExtensionDisabledDialogDelegate();
 
   // ExtensionInstallUI::Delegate:
-  virtual void InstallUIProceed();
-  virtual void InstallUIAbort(bool user_initiated);
+  virtual void InstallUIProceed() OVERRIDE;
+  virtual void InstallUIAbort(bool user_initiated) OVERRIDE;
 
   // The UI for showing the install dialog when enabling.
   scoped_ptr<ExtensionInstallUI> install_ui_;
diff --git a/chrome/browser/extensions/extension_event_router.h b/chrome/browser/extensions/extension_event_router.h
index 99ca416..909d185 100644
--- a/chrome/browser/extensions/extension_event_router.h
+++ b/chrome/browser/extensions/extension_event_router.h
@@ -10,6 +10,7 @@
 #include <set>
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "content/common/notification_observer.h"
@@ -111,7 +112,7 @@ class ExtensionEventRouter : public NotificationObserver {
 
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
 
   Profile* profile_;
 
diff --git a/chrome/browser/extensions/extension_function.h b/chrome/browser/extensions/extension_function.h
index 6afbed8..f0bef3a 100644
--- a/chrome/browser/extensions/extension_function.h
+++ b/chrome/browser/extensions/extension_function.h
@@ -9,6 +9,7 @@
 #include <string>
 #include <list>
 
+#include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ -268,7 +269,7 @@ class UIThreadExtensionFunction : public ExtensionFunction {
    private:
     virtual void Observe(int type,
                          const NotificationSource& source,
-                         const NotificationDetails& details);
+                         const NotificationDetails& details) OVERRIDE;
     UIThreadExtensionFunction* function_;
     NotificationRegistrar registrar_;
   };
diff --git a/chrome/browser/extensions/extension_history_api.h b/chrome/browser/extensions/extension_history_api.h
index af57c6b..a7ec19a 100644
--- a/chrome/browser/extensions/extension_history_api.h
+++ b/chrome/browser/extensions/extension_history_api.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/history/history.h"
 #include "chrome/browser/history/history_notifications.h"
@@ -26,7 +27,7 @@ class ExtensionHistoryEventRouter : public NotificationObserver {
   // NotificationObserver::Observe.
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
 
   void HistoryUrlVisited(Profile* profile,
                          const history::URLVisitedDetails* details);
@@ -48,7 +49,7 @@ class ExtensionHistoryEventRouter : public NotificationObserver {
 // Base class for history function APIs.
 class HistoryFunction : public AsyncExtensionFunction {
  public:
-  virtual void Run();
+  virtual void Run() OVERRIDE;
   virtual bool RunImpl() = 0;
 
   bool GetUrlFromValue(base::Value* value, GURL* url);
@@ -70,7 +71,7 @@ class HistoryFunctionWithCallback : public HistoryFunction {
   virtual void SendAsyncResponse();
 
   // Override HistoryFunction::RunImpl.
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
 
  protected:
   // The consumer for the HistoryService callbacks.
@@ -85,7 +86,7 @@ class HistoryFunctionWithCallback : public HistoryFunction {
 class GetVisitsHistoryFunction : public HistoryFunctionWithCallback {
  public:
   // Override HistoryFunction.
-  virtual bool RunAsyncImpl();
+  virtual bool RunAsyncImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("history.getVisits");
 
   // Callback for the history function to provide results.
@@ -97,7 +98,7 @@ class GetVisitsHistoryFunction : public HistoryFunctionWithCallback {
 
 class SearchHistoryFunction : public HistoryFunctionWithCallback {
  public:
-  virtual bool RunAsyncImpl();
+  virtual bool RunAsyncImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("history.search");
 
   // Callback for the history function to provide results.
@@ -107,13 +108,13 @@ class SearchHistoryFunction : public HistoryFunctionWithCallback {
 
 class AddUrlHistoryFunction : public HistoryFunction {
  public:
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("history.addUrl");
 };
 
 class DeleteAllHistoryFunction : public HistoryFunctionWithCallback {
  public:
-  virtual bool RunAsyncImpl();
+  virtual bool RunAsyncImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("history.deleteAll");
 
   // Callback for the history service to acknowledge deletion.
@@ -123,13 +124,13 @@ class DeleteAllHistoryFunction : public HistoryFunctionWithCallback {
 
 class DeleteUrlHistoryFunction : public HistoryFunction {
  public:
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("history.deleteUrl");
 };
 
 class DeleteRangeHistoryFunction : public HistoryFunctionWithCallback {
  public:
-  virtual bool RunAsyncImpl();
+  virtual bool RunAsyncImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("history.deleteRange");
 
   // Callback for the history service to acknowledge deletion.
diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h
index 466ca52..703daed 100644
--- a/chrome/browser/extensions/extension_host.h
+++ b/chrome/browser/extensions/extension_host.h
@@ -87,7 +87,7 @@ class ExtensionHost : public RenderViewHostDelegate,
   ViewType::Type extension_host_type() const { return extension_host_type_; }
 
   // ExtensionFunctionDispatcher::Delegate
-  virtual TabContents* GetAssociatedTabContents() const;
+  virtual TabContents* GetAssociatedTabContents() const OVERRIDE;
   void set_associated_tab_contents(TabContents* associated_tab_contents) {
     associated_tab_contents_ = associated_tab_contents;
   }
@@ -154,36 +154,37 @@ class ExtensionHost : public RenderViewHostDelegate,
   // RenderViewHostDelegate::View
   virtual void CreateNewWindow(
       int route_id,
-      const ViewHostMsg_CreateWindow_Params& params);
-  virtual void CreateNewWidget(int route_id, WebKit::WebPopupType popup_type);
-  virtual void CreateNewFullscreenWidget(int route_id);
+      const ViewHostMsg_CreateWindow_Params& params) OVERRIDE;
+  virtual void CreateNewWidget(int route_id,
+                               WebKit::WebPopupType popup_type) OVERRIDE;
+  virtual void CreateNewFullscreenWidget(int route_id) OVERRIDE;
   virtual void ShowCreatedWindow(int route_id,
                                  WindowOpenDisposition disposition,
                                  const gfx::Rect& initial_pos,
-                                 bool user_gesture);
+                                 bool user_gesture) OVERRIDE;
   virtual void ShowCreatedWidget(int route_id,
-                                 const gfx::Rect& initial_pos);
-  virtual void ShowCreatedFullscreenWidget(int route_id);
-  virtual void ShowContextMenu(const ContextMenuParams& params);
+                                 const gfx::Rect& initial_pos) OVERRIDE;
+  virtual void ShowCreatedFullscreenWidget(int route_id) OVERRIDE;
+  virtual void ShowContextMenu(const ContextMenuParams& params) OVERRIDE;
   virtual void ShowPopupMenu(const gfx::Rect& bounds,
                              int item_height,
                              double item_font_size,
                              int selected_item,
                              const std::vector<WebMenuItem>& items,
-                             bool right_aligned);
+                             bool right_aligned) OVERRIDE;
   virtual void StartDragging(const WebDropData& drop_data,
                              WebKit::WebDragOperationsMask allowed_operations,
                              const SkBitmap& image,
-                             const gfx::Point& image_offset);
-  virtual void UpdateDragCursor(WebKit::WebDragOperation operation);
-  virtual void GotFocus();
-  virtual void TakeFocus(bool reverse);
-  virtual void UpdatePreferredSize(const gfx::Size& new_size);
+                             const gfx::Point& image_offset) OVERRIDE;
+  virtual void UpdateDragCursor(WebKit::WebDragOperation operation) OVERRIDE;
+  virtual void GotFocus() OVERRIDE;
+  virtual void TakeFocus(bool reverse) OVERRIDE;
+  virtual void UpdatePreferredSize(const gfx::Size& new_size) OVERRIDE;
 
   // NotificationObserver
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
 
   // Overridden from content::JavaScriptDialogDelegate:
   virtual void OnDialogClosed(IPC::Message* reply_msg,
@@ -220,8 +221,8 @@ class ExtensionHost : public RenderViewHostDelegate,
   const Browser* GetBrowser() const;
 
   // ExtensionFunctionDispatcher::Delegate
-  virtual Browser* GetBrowser();
-  virtual gfx::NativeView GetNativeViewOfHost();
+  virtual Browser* GetBrowser() OVERRIDE;
+  virtual gfx::NativeView GetNativeViewOfHost() OVERRIDE;
 
   // Message handlers.
   void OnRequest(const ExtensionHostMsg_Request_Params& params);
diff --git a/chrome/browser/extensions/extension_install_ui.cc b/chrome/browser/extensions/extension_install_ui.cc
index d0b240d..44c7b5e 100644
--- a/chrome/browser/extensions/extension_install_ui.cc
+++ b/chrome/browser/extensions/extension_install_ui.cc
@@ -209,8 +209,6 @@ void ExtensionInstallUI::OnImageLoaded(
     case PERMISSIONS_PROMPT:
     case RE_ENABLE_PROMPT:
     case INSTALL_PROMPT: {
-      // TODO(jcivelli): http://crbug.com/44771 We should not show an install
-      //                 dialog when installing an app from the gallery.
       NotificationService* service = NotificationService::current();
       service->Notify(chrome::NOTIFICATION_EXTENSION_WILL_SHOW_CONFIRM_DIALOG,
           Source<ExtensionInstallUI>(this),
diff --git a/chrome/browser/extensions/extension_install_ui.h b/chrome/browser/extensions/extension_install_ui.h
index 4ce5720..e73e756 100644
--- a/chrome/browser/extensions/extension_install_ui.h
+++ b/chrome/browser/extensions/extension_install_ui.h
@@ -9,6 +9,7 @@
 #include <string>
 #include <vector>
 
+#include "base/compiler_specific.h"
 #include "base/string16.h"
 #include "chrome/browser/extensions/image_loading_tracker.h"
 #include "chrome/common/extensions/url_pattern.h"
@@ -93,7 +94,7 @@ class ExtensionInstallUI : public ImageLoadingTracker::Observer {
 
   // ImageLoadingTracker::Observer:
   virtual void OnImageLoaded(
-      SkBitmap* image, const ExtensionResource& resource, int index);
+      SkBitmap* image, const ExtensionResource& resource, int index) OVERRIDE;
 
   // Opens a new tab page and animates the app icon for the app with id
   // |app_id|.
diff --git a/chrome/browser/extensions/extension_management_api.h b/chrome/browser/extensions/extension_management_api.h
index 41bfc6f9..6ebe35c 100644
--- a/chrome/browser/extensions/extension_management_api.h
+++ b/chrome/browser/extensions/extension_management_api.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_MANAGEMENT_API_H__
 #pragma once
 
+#include "base/compiler_specific.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
@@ -19,19 +20,19 @@ class ExtensionManagementFunction : public SyncExtensionFunction {
 
 class GetAllExtensionsFunction : public ExtensionManagementFunction {
   virtual ~GetAllExtensionsFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("management.getAll");
 };
 
 class GetExtensionByIdFunction : public ExtensionManagementFunction {
   virtual ~GetExtensionByIdFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("management.get");
 };
 
 class GetPermissionWarningsByIdFunction : public ExtensionManagementFunction {
   virtual ~GetPermissionWarningsByIdFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("management.getPermissionWarningsById");
 };
 
@@ -42,26 +43,26 @@ class GetPermissionWarningsByManifestFunction : public AsyncExtensionFunction {
   void OnParseFailure(const std::string& error);
  protected:
   virtual ~GetPermissionWarningsByManifestFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME(
       "management.getPermissionWarningsByManifest");
 };
 
 class LaunchAppFunction : public ExtensionManagementFunction {
   virtual ~LaunchAppFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("management.launchApp");
 };
 
 class SetEnabledFunction : public ExtensionManagementFunction {
   virtual ~SetEnabledFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("management.setEnabled");
 };
 
 class UninstallFunction : public ExtensionManagementFunction {
   virtual ~UninstallFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("management.uninstall");
 };
 
@@ -76,7 +77,7 @@ class ExtensionManagementEventRouter : public NotificationObserver {
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
 
   NotificationRegistrar registrar_;
 
diff --git a/chrome/browser/extensions/extension_menu_manager.h b/chrome/browser/extensions/extension_menu_manager.h
index 0472225..af8345f 100644
--- a/chrome/browser/extensions/extension_menu_manager.h
+++ b/chrome/browser/extensions/extension_menu_manager.h
@@ -12,6 +12,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
@@ -247,7 +248,7 @@ class ExtensionMenuManager : public NotificationObserver {
 
   // Implements the NotificationObserver interface.
   virtual void Observe(int type, const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(ExtensionMenuManagerTest, DeleteParent);
diff --git a/chrome/browser/extensions/extension_message_service.h b/chrome/browser/extensions/extension_message_service.h
index 91e8239..cfcd7fe 100644
--- a/chrome/browser/extensions/extension_message_service.h
+++ b/chrome/browser/extensions/extension_message_service.h
@@ -10,6 +10,7 @@
 #include <set>
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
@@ -136,7 +137,7 @@ class ExtensionMessageService
   // NotificationObserver interface.
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
 
   // An IPC sender that might be in our list of channels has closed.
   void OnSenderClosed(IPC::Message::Sender* sender);
diff --git a/chrome/browser/extensions/extension_permissions_api.h b/chrome/browser/extensions/extension_permissions_api.h
index f70e4f5..39096f2 100644
--- a/chrome/browser/extensions/extension_permissions_api.h
+++ b/chrome/browser/extensions/extension_permissions_api.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_PERMISSIONS_API_H__
 #pragma once
 
+#include "base/compiler_specific.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/common/extensions/extension_permission_set.h"
diff --git a/chrome/browser/extensions/extension_preference_api.h b/chrome/browser/extensions/extension_preference_api.h
index 5ac4b78..563fcc9 100644
--- a/chrome/browser/extensions/extension_preference_api.h
+++ b/chrome/browser/extensions/extension_preference_api.h
@@ -25,7 +25,7 @@ class ExtensionPreferenceEventRouter : public NotificationObserver {
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
 
   void OnPrefChanged(PrefService* pref_service, const std::string& pref_key);
 
@@ -69,21 +69,21 @@ class PrefTransformerInterface {
 class GetPreferenceFunction : public SyncExtensionFunction {
  public:
   virtual ~GetPreferenceFunction();
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("types.ChromeSetting.get")
 };
 
 class SetPreferenceFunction : public SyncExtensionFunction {
  public:
   virtual ~SetPreferenceFunction();
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("types.ChromeSetting.set")
 };
 
 class ClearPreferenceFunction : public SyncExtensionFunction {
  public:
   virtual ~ClearPreferenceFunction();
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("types.ChromeSetting.clear")
 };
 
diff --git a/chrome/browser/extensions/extension_process_manager.h b/chrome/browser/extensions/extension_process_manager.h
index fd7682f..cf1d942 100644
--- a/chrome/browser/extensions/extension_process_manager.h
+++ b/chrome/browser/extensions/extension_process_manager.h
@@ -10,6 +10,7 @@
 #include <set>
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
@@ -107,7 +108,7 @@ class ExtensionProcessManager : public NotificationObserver {
   // NotificationObserver:
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
 
   NotificationRegistrar registrar_;
 
diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc
index f0b8db9..9221c5c 100644
--- a/chrome/browser/extensions/extension_protocols.cc
+++ b/chrome/browser/extensions/extension_protocols.cc
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 
+#include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ -62,7 +63,7 @@ class URLRequestResourceBundleJob : public net::URLRequestSimpleJob {
   // Overridden from URLRequestSimpleJob:
   virtual bool GetData(std::string* mime_type,
                        std::string* charset,
-                       std::string* data) const {
+                       std::string* data) const OVERRIDE {
     const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     *data = rb.GetRawDataResource(resource_id_).as_string();
 
@@ -109,7 +110,7 @@ class URLRequestExtensionJob : public net::URLRequestFileJob {
     response_info_.headers = BuildHttpHeaders(content_security_policy);
   }
 
-  virtual void GetResponseInfo(net::HttpResponseInfo* info) {
+  virtual void GetResponseInfo(net::HttpResponseInfo* info) OVERRIDE {
     *info = response_info_;
   }
 
diff --git a/chrome/browser/extensions/extension_service.h b/chrome/browser/extensions/extension_service.h
index c25c976..4e1f290 100644
--- a/chrome/browser/extensions/extension_service.h
+++ b/chrome/browser/extensions/extension_service.h
@@ -498,18 +498,20 @@ class ExtensionService
   virtual void OnExternalExtensionFileFound(const std::string& id,
                                             const Version* version,
                                             const FilePath& path,
-                                            Extension::Location location);
+                                            Extension::Location location)
+      OVERRIDE;
 
   virtual void OnExternalExtensionUpdateUrlFound(const std::string& id,
                                                  const GURL& update_url,
-                                                 Extension::Location location);
+                                                 Extension::Location location)
+      OVERRIDE;
 
-  virtual void OnExternalProviderReady();
+  virtual void OnExternalProviderReady() OVERRIDE;
 
   // NotificationObserver
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
 
   // Whether there are any apps installed. Component apps are not included.
   bool HasApps() const;
diff --git a/chrome/browser/extensions/extension_tabs_module.h b/chrome/browser/extensions/extension_tabs_module.h
index b6faaab..bef9143 100644
--- a/chrome/browser/extensions/extension_tabs_module.h
+++ b/chrome/browser/extensions/extension_tabs_module.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "content/browser/tab_contents/tab_contents_observer.h"
 #include "content/common/notification_observer.h"
@@ -59,64 +60,64 @@ bool GetTabById(int tab_id, Profile* profile, bool incognito_enabled,
 // Windows
 class GetWindowFunction : public SyncExtensionFunction {
   virtual ~GetWindowFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("windows.get")
 };
 class GetCurrentWindowFunction : public SyncExtensionFunction {
   virtual ~GetCurrentWindowFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("windows.getCurrent")
 };
 class GetLastFocusedWindowFunction : public SyncExtensionFunction {
   virtual ~GetLastFocusedWindowFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("windows.getLastFocused")
 };
 class GetAllWindowsFunction : public SyncExtensionFunction {
   virtual ~GetAllWindowsFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("windows.getAll")
 };
 class CreateWindowFunction : public SyncExtensionFunction {
   virtual ~CreateWindowFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("windows.create")
 };
 class UpdateWindowFunction : public SyncExtensionFunction {
   virtual ~UpdateWindowFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("windows.update")
 };
 class RemoveWindowFunction : public SyncExtensionFunction {
   virtual ~RemoveWindowFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("windows.remove")
 };
 
 // Tabs
 class GetTabFunction : public SyncExtensionFunction {
   virtual ~GetTabFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.get")
 };
 class GetCurrentTabFunction : public SyncExtensionFunction {
   virtual ~GetCurrentTabFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.getCurrent")
 };
 class GetSelectedTabFunction : public SyncExtensionFunction {
   virtual ~GetSelectedTabFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.getSelected")
 };
 class GetAllTabsInWindowFunction : public SyncExtensionFunction {
   virtual ~GetAllTabsInWindowFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.getAllInWindow")
 };
 class CreateTabFunction : public SyncExtensionFunction {
   virtual ~CreateTabFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.create")
 };
 class UpdateTabFunction : public AsyncExtensionFunction,
@@ -125,7 +126,7 @@ class UpdateTabFunction : public AsyncExtensionFunction,
   UpdateTabFunction();
  private:
   virtual ~UpdateTabFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   virtual bool OnMessageReceived(const IPC::Message& message);
   void OnExecuteCodeFinished(int request_id,
                              bool success,
@@ -134,23 +135,23 @@ class UpdateTabFunction : public AsyncExtensionFunction,
 };
 class MoveTabFunction : public SyncExtensionFunction {
   virtual ~MoveTabFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.move")
 };
 class RemoveTabFunction : public SyncExtensionFunction {
   virtual ~RemoveTabFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.remove")
 };
 class DetectTabLanguageFunction : public AsyncExtensionFunction,
                                   public NotificationObserver {
  private:
   virtual ~DetectTabLanguageFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
 
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
   void GotLanguage(const std::string& language);
   NotificationRegistrar registrar_;
   DECLARE_EXTENSION_FUNCTION_NAME("tabs.detectLanguage")
@@ -167,11 +168,11 @@ class CaptureVisibleTabFunction : public AsyncExtensionFunction,
   static const int kDefaultQuality;
 
   virtual ~CaptureVisibleTabFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   virtual bool CaptureSnapshotFromBackingStore(BackingStore* backing_store);
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
   virtual void SendResultFromBitmap(const SkBitmap& screen_capture);
 
   NotificationRegistrar registrar_;
diff --git a/chrome/browser/extensions/extension_test_message_listener.h b/chrome/browser/extensions/extension_test_message_listener.h
index 66be515..7878e7474 100644
--- a/chrome/browser/extensions/extension_test_message_listener.h
+++ b/chrome/browser/extensions/extension_test_message_listener.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 
@@ -61,7 +62,7 @@ class ExtensionTestMessageListener : public NotificationObserver {
   // Implements the NotificationObserver interface.
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
 
   bool was_satisfied() const { return satisfied_; }
 
diff --git a/chrome/browser/extensions/extension_toolbar_model.h b/chrome/browser/extensions/extension_toolbar_model.h
index e60d7e0..7c2a54b696 100644
--- a/chrome/browser/extensions/extension_toolbar_model.h
+++ b/chrome/browser/extensions/extension_toolbar_model.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_TOOLBAR_MODEL_H_
 #pragma once
 
+#include "base/compiler_specific.h"
 #include "base/observer_list.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/common/notification_observer.h"
@@ -76,7 +77,7 @@ class ExtensionToolbarModel : public NotificationObserver {
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
 
   // To be called after the extension service is ready; gets loaded extensions
   // from the extension service and their saved order from the pref service
diff --git a/chrome/browser/extensions/extension_updater.h b/chrome/browser/extensions/extension_updater.h
index d2db59e..169756e 100644
--- a/chrome/browser/extensions/extension_updater.h
+++ b/chrome/browser/extensions/extension_updater.h
@@ -13,6 +13,7 @@
 #include <string>
 #include <vector>
 
+#include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ -251,7 +252,7 @@ class ExtensionUpdater : public URLFetcher::Delegate,
   base::TimeDelta DetermineFirstCheckDelay();
 
   // URLFetcher::Delegate interface.
-  virtual void OnURLFetchComplete(const URLFetcher* source);
+  virtual void OnURLFetchComplete(const URLFetcher* source) OVERRIDE;
 
   // These do the actual work when a URL fetch completes.
   virtual void OnManifestFetchComplete(const GURL& url,
@@ -334,7 +335,7 @@ class ExtensionUpdater : public URLFetcher::Delegate,
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
 
   // Whether Start() has been called but not Stop().
   bool alive_;
diff --git a/chrome/browser/extensions/extension_webnavigation_api.h b/chrome/browser/extensions/extension_webnavigation_api.h
index 7b8355e..a522008 100644
--- a/chrome/browser/extensions/extension_webnavigation_api.h
+++ b/chrome/browser/extensions/extension_webnavigation_api.h
@@ -13,6 +13,7 @@
 #include <map>
 #include <set>
 
+#include "base/compiler_specific.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/browser/tab_contents/tab_contents_observer.h"
@@ -187,7 +188,7 @@ class ExtensionWebNavigationEventRouter : public NotificationObserver {
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
 
   // Handler for the NOTIFICATION_RETARGETING event. The method takes the
   // details of such an event and stores them for the later
@@ -218,7 +219,7 @@ class ExtensionWebNavigationEventRouter : public NotificationObserver {
 // API function that returns the state of a given frame.
 class GetFrameFunction : public SyncExtensionFunction {
   virtual ~GetFrameFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("experimental.webNavigation.getFrame")
 };
 
diff --git a/chrome/browser/extensions/external_policy_extension_loader.h b/chrome/browser/extensions/external_policy_extension_loader.h
index ce4721b..ecfc7e4 100644
--- a/chrome/browser/extensions/external_policy_extension_loader.h
+++ b/chrome/browser/extensions/external_policy_extension_loader.h
@@ -8,6 +8,7 @@
 
 #include "chrome/browser/extensions/external_extension_loader.h"
 
+#include "base/compiler_specific.h"
 #include "chrome/browser/prefs/pref_change_registrar.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
@@ -27,10 +28,10 @@ class ExternalPolicyExtensionLoader
   // NotificationObserver implementation
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
 
  protected:
-  virtual void StartLoading();
+  virtual void StartLoading() OVERRIDE;
 
  private:
   friend class base::RefCountedThreadSafe<ExternalExtensionLoader>;
diff --git a/chrome/browser/extensions/external_pref_extension_loader.h b/chrome/browser/extensions/external_pref_extension_loader.h
index 37b8196..8473635 100644
--- a/chrome/browser/extensions/external_pref_extension_loader.h
+++ b/chrome/browser/extensions/external_pref_extension_loader.h
@@ -10,6 +10,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 
@@ -24,10 +25,10 @@ class ExternalPrefExtensionLoader : public ExternalExtensionLoader {
   // to this path.
   explicit ExternalPrefExtensionLoader(int base_path_key);
 
-  virtual const FilePath GetBaseCrxFilePath();
+  virtual const FilePath GetBaseCrxFilePath() OVERRIDE;
 
  protected:
-  virtual void StartLoading();
+  virtual void StartLoading() OVERRIDE;
 
  private:
   friend class base::RefCountedThreadSafe<ExternalExtensionLoader>;
@@ -50,10 +51,10 @@ class ExternalTestingExtensionLoader : public ExternalExtensionLoader {
       const std::string& json_data,
       const FilePath& fake_base_path);
 
-  virtual const FilePath GetBaseCrxFilePath();
+  virtual const FilePath GetBaseCrxFilePath() OVERRIDE;
 
  protected:
-  virtual void StartLoading();
+  virtual void StartLoading() OVERRIDE;
 
  private:
   friend class base::RefCountedThreadSafe<ExternalExtensionLoader>;
diff --git a/chrome/browser/extensions/external_registry_extension_loader_win.h b/chrome/browser/extensions/external_registry_extension_loader_win.h
index 7b0d189..29db503 100644
--- a/chrome/browser/extensions/external_registry_extension_loader_win.h
+++ b/chrome/browser/extensions/external_registry_extension_loader_win.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_EXTENSIONS_EXTERNAL_REGISTRY_EXTENSION_LOADER_WIN_H_
 #pragma once
 
+#include "base/compiler_specific.h"
 #include "chrome/browser/extensions/external_extension_loader.h"
 
 class ExternalRegistryExtensionLoader : public ExternalExtensionLoader {
@@ -13,7 +14,7 @@ class ExternalRegistryExtensionLoader : public ExternalExtensionLoader {
   ExternalRegistryExtensionLoader() {}
 
  protected:
-  virtual void StartLoading();
+  virtual void StartLoading() OVERRIDE;
 
  private:
   friend class base::RefCountedThreadSafe<ExternalExtensionLoader>;
diff --git a/chrome/browser/extensions/image_loading_tracker.h b/chrome/browser/extensions/image_loading_tracker.h
index a48a6ef..df6a3b0 100644
--- a/chrome/browser/extensions/image_loading_tracker.h
+++ b/chrome/browser/extensions/image_loading_tracker.h
@@ -8,6 +8,7 @@
 
 #include <map>
 
+#include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
@@ -88,7 +89,7 @@ class ImageLoadingTracker : public NotificationObserver {
   // waiting for the image we remove the entry from load_map_.
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
 
   // The view that is waiting for the image to load.
   Observer* observer_;
diff --git a/chrome/browser/extensions/theme_installed_infobar_delegate.h b/chrome/browser/extensions/theme_installed_infobar_delegate.h
index d34526d..2ac28ad 100644
--- a/chrome/browser/extensions/theme_installed_infobar_delegate.h
+++ b/chrome/browser/extensions/theme_installed_infobar_delegate.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_EXTENSIONS_THEME_INSTALLED_INFOBAR_DELEGATE_H_
 #pragma once
 
+#include "base/compiler_specific.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
@@ -35,7 +36,7 @@ class ThemeInstalledInfoBarDelegate : public ConfirmInfoBarDelegate,
   ThemeService* theme_service() { return theme_service_; }
 
   // ConfirmInfoBarDelegate:
-  virtual bool Cancel();
+  virtual bool Cancel() OVERRIDE;
 
  private:
   // ConfirmInfoBarDelegate:
diff --git a/chrome/browser/extensions/user_script_listener.h b/chrome/browser/extensions/user_script_listener.h
index 5ebae08..58494a2 100644
--- a/chrome/browser/extensions/user_script_listener.h
+++ b/chrome/browser/extensions/user_script_listener.h
@@ -8,6 +8,7 @@
 
 #include <list>
 
+#include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "content/browser/renderer_host/resource_queue.h"
 #include "content/common/notification_observer.h"
@@ -37,12 +38,12 @@ class UserScriptListener
   UserScriptListener();
 
   // ResourceQueueDelegate:
-  virtual void Initialize(ResourceQueue* resource_queue);
+  virtual void Initialize(ResourceQueue* resource_queue) OVERRIDE;
   virtual bool ShouldDelayRequest(
       net::URLRequest* request,
       const ResourceDispatcherHostRequestInfo& request_info,
-      const GlobalRequestID& request_id);
-  virtual void WillShutdownResourceQueue();
+      const GlobalRequestID& request_id) OVERRIDE;
+  virtual void WillShutdownResourceQueue() OVERRIDE;
 
  private:
   friend class base::RefCountedThreadSafe<UserScriptListener>;
@@ -91,7 +92,7 @@ class UserScriptListener
   // NotificationObserver
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
 
   NotificationRegistrar registrar_;
 
diff --git a/chrome/browser/extensions/user_script_master.h b/chrome/browser/extensions/user_script_master.h
index a37a1db..2ec773b 100644
--- a/chrome/browser/extensions/user_script_master.h
+++ b/chrome/browser/extensions/user_script_master.h
@@ -9,6 +9,7 @@
 #include <map>
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
@@ -131,7 +132,7 @@ class UserScriptMaster : public base::RefCountedThreadSafe<UserScriptMaster>,
   // NotificationObserver implementation.
   virtual void Observe(int type,
                        const NotificationSource& source,
-                       const NotificationDetails& details);
+                       const NotificationDetails& details) OVERRIDE;
 
   // Sends the renderer process a new set of user scripts.
   void SendUpdate(RenderProcessHost* process,
diff --git a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_unittest.mm b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_unittest.mm
index a6fa3db..f54ec2b 100644
--- a/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_unittest.mm
@@ -4,6 +4,7 @@
 
 #import <Cocoa/Cocoa.h>
 
+#include "base/compiler_specific.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ -84,11 +85,11 @@ class MockExtensionInstallUIDelegate : public ExtensionInstallUI::Delegate {
         abort_count_(0) {}
 
   // ExtensionInstallUI::Delegate overrides.
-  virtual void InstallUIProceed() {
+  virtual void InstallUIProceed() OVERRIDE {
     proceed_count_++;
   }
 
-  virtual void InstallUIAbort(bool user_initiated) {
+  virtual void InstallUIAbort(bool user_initiated) OVERRIDE {
     abort_count_++;
   }