Add OVERRIDE to chrome/browser/chromeos/.

BUG=104314
TEST=no change

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

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

65 files changed, 311 insertions, 233 deletions

diff --git a/chrome/browser/chromeos/audio_mixer_alsa.h b/chrome/browser/chromeos/audio_mixer_alsa.h
index ea7bb6b..7ec758a 100644
--- a/chrome/browser/chromeos/audio_mixer_alsa.h
+++ b/chrome/browser/chromeos/audio_mixer_alsa.h
@@ -10,6 +10,7 @@
 
 #include "base/basictypes.h"
 #include "base/callback_old.h"
+#include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
@@ -31,13 +32,14 @@ class AudioMixerAlsa : public AudioMixer {
   virtual ~AudioMixerAlsa();
 
   // AudioMixer implementation.
-  virtual void Init();
-  virtual bool IsInitialized();
-  virtual void GetVolumeLimits(double* min_volume_db, double* max_volume_db);
-  virtual double GetVolumeDb();
-  virtual void SetVolumeDb(double volume_db);
-  virtual bool IsMuted();
-  virtual void SetMuted(bool muted);
+  virtual void Init() OVERRIDE;
+  virtual bool IsInitialized() OVERRIDE;
+  virtual void GetVolumeLimits(double* min_volume_db,
+                               double* max_volume_db) OVERRIDE;
+  virtual double GetVolumeDb() OVERRIDE;
+  virtual void SetVolumeDb(double volume_db) OVERRIDE;
+  virtual bool IsMuted() OVERRIDE;
+  virtual void SetMuted(bool muted) OVERRIDE;
 
   // Registers volume and mute preferences.
   // TODO(derat): Move prefs into AudioHandler.
diff --git a/chrome/browser/chromeos/boot_times_loader.h b/chrome/browser/chromeos/boot_times_loader.h
index dfd73d2..962009d 100644
--- a/chrome/browser/chromeos/boot_times_loader.h
+++ b/chrome/browser/chromeos/boot_times_loader.h
@@ -11,6 +11,7 @@
 
 #include "base/atomic_sequence_num.h"
 #include "base/callback_old.h"
+#include "base/compiler_specific.h"
 #include "base/time.h"
 #include "content/browser/cancelable_request.h"
 #include "content/browser/renderer_host/render_widget_host.h"
@@ -105,7 +106,7 @@ class BootTimesLoader
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // Writes the logout times to a /tmp/logout-times-sent. Unlike login
   // times, we manually call this function for logout times, as we cannot
diff --git a/chrome/browser/chromeos/brightness_observer.h b/chrome/browser/chromeos/brightness_observer.h
index d8f5b66..b18a9a5 100644
--- a/chrome/browser/chromeos/brightness_observer.h
+++ b/chrome/browser/chromeos/brightness_observer.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
 
 namespace chromeos {
@@ -20,7 +21,7 @@ class BrightnessObserver : public PowerManagerClient::Observer {
 
  private:
   // PowerManagerClient::Observer implementation.
-  virtual void BrightnessChanged(int level, bool user_initiated);
+  virtual void BrightnessChanged(int level, bool user_initiated) OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(BrightnessObserver);
 };
diff --git a/chrome/browser/chromeos/cros/network_library.h b/chrome/browser/chromeos/cros/network_library.h
index 6423a87..938bf60 100644
--- a/chrome/browser/chromeos/cros/network_library.h
+++ b/chrome/browser/chromeos/cros/network_library.h
@@ -9,6 +9,7 @@
 #include <string>
 #include <vector>
 
+#include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
@@ -822,8 +823,8 @@ class VirtualNetwork : public Network {
       const std::string& slot, const std::string& pin);
 
   // Network overrides.
-  virtual bool RequiresUserProfile() const;
-  virtual void CopyCredentialsFromRemembered(Network* remembered);
+  virtual bool RequiresUserProfile() const OVERRIDE;
+  virtual void CopyCredentialsFromRemembered(Network* remembered) OVERRIDE;
 
   // Public getters.
   bool NeedMoreInfoToConnect() const;
@@ -1153,7 +1154,7 @@ class WifiNetwork : public WirelessNetwork {
   void SetCertificatePin(const std::string& pin);
 
   // Network overrides.
-  virtual bool RequiresUserProfile() const;
+  virtual bool RequiresUserProfile() const OVERRIDE;
 
   // Return a string representation of the encryption code.
   // This not translated and should be only used for debugging purposes.
diff --git a/chrome/browser/chromeos/customization_document.h b/chrome/browser/chromeos/customization_document.h
index 9c9e868..a60a136 100644
--- a/chrome/browser/chromeos/customization_document.h
+++ b/chrome/browser/chromeos/customization_document.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/singleton.h"
@@ -148,7 +149,7 @@ class ServicesCustomizationDocument : public CustomizationDocument,
   static void SetApplied(bool val);
 
   // Overriden from content::URLFetcherDelegate:
-  virtual void OnURLFetchComplete(const content::URLFetcher* source);
+  virtual void OnURLFetchComplete(const content::URLFetcher* source) OVERRIDE;
 
   // Initiate file fetching.
   void StartFileFetch();
diff --git a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h b/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h
index 8fc0635..5a26358 100644
--- a/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h
+++ b/chrome/browser/chromeos/dbus/proxy_resolution_service_provider.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ -80,7 +81,8 @@ class ProxyResolutionServiceProvider
   virtual ~ProxyResolutionServiceProvider();
 
   // CrosDBusService::ServiceProviderInterface override.
-  virtual void Start(scoped_refptr<dbus::ExportedObject> exported_object);
+  virtual void Start(
+      scoped_refptr<dbus::ExportedObject> exported_object) OVERRIDE;
 
   // Creates the instance.
   static ProxyResolutionServiceProvider* Create();
diff --git a/chrome/browser/chromeos/enterprise_extension_observer.h b/chrome/browser/chromeos/enterprise_extension_observer.h
index f342bed..d0d4207 100644
--- a/chrome/browser/chromeos/enterprise_extension_observer.h
+++ b/chrome/browser/chromeos/enterprise_extension_observer.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_ENTERPRISE_EXTENSION_OBSERVER_H_
 #pragma once
 
+#include "base/compiler_specific.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_observer.h"
@@ -28,7 +29,7 @@ class EnterpriseExtensionObserver
 
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
  private:
   static void CheckExtensionAndNotifyEntd(const FilePath& path);
diff --git a/chrome/browser/chromeos/frame/browser_view.h b/chrome/browser/chromeos/frame/browser_view.h
index 5feedba..b08bfba 100644
--- a/chrome/browser/chromeos/frame/browser_view.h
+++ b/chrome/browser/chromeos/frame/browser_view.h
@@ -124,7 +124,7 @@ class BrowserView : public ::BrowserView,
 
  protected:
   virtual void GetAccessiblePanes(
-      std::vector<views::AccessiblePaneView*>* panes);
+      std::vector<views::AccessiblePaneView*>* panes) OVERRIDE;
 
  private:
   void InitSystemMenu();
diff --git a/chrome/browser/chromeos/gview_request_interceptor.h b/chrome/browser/chromeos/gview_request_interceptor.h
index a4e1977..3d537de 100644
--- a/chrome/browser/chromeos/gview_request_interceptor.h
+++ b/chrome/browser/chromeos/gview_request_interceptor.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include <string>
+#include "base/compiler_specific.h"
 #include "base/hash_tables.h"
 #include "net/url_request/url_request_job_factory.h"
 
@@ -25,18 +26,19 @@ class GViewRequestInterceptor : public net::URLRequestJobFactory::Interceptor {
 
   // Always returns NULL because we don't want to attempt a redirect
   // before seeing the detected mime type of the request.
-  virtual net::URLRequestJob* MaybeIntercept(net::URLRequest* request) const;
+  virtual net::URLRequestJob* MaybeIntercept(
+      net::URLRequest* request) const OVERRIDE;
 
   // Always returns NULL.
   virtual net::URLRequestJob* MaybeInterceptRedirect(
       const GURL& location,
-      net::URLRequest* request) const;
+      net::URLRequest* request) const OVERRIDE;
 
   // Determines if the requested document can be viewed by the Google
   // Document Viewer.  If it can, returns a net::URLRequestJob that
   // redirects the browser to the view URL.
   virtual net::URLRequestJob* MaybeInterceptResponse(
-      net::URLRequest* request) const;
+      net::URLRequest* request) const OVERRIDE;
 
  private:
   bool ShouldUsePdfPlugin(net::URLRequest* request) const;
diff --git a/chrome/browser/chromeos/legacy_window_manager/wm_message_listener.h b/chrome/browser/chromeos/legacy_window_manager/wm_message_listener.h
index cdb2462..41f505e 100644
--- a/chrome/browser/chromeos/legacy_window_manager/wm_message_listener.h
+++ b/chrome/browser/chromeos/legacy_window_manager/wm_message_listener.h
@@ -8,6 +8,7 @@
 
 #include <gtk/gtk.h>
 
+#include "base/compiler_specific.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop.h"
 #include "base/observer_list.h"
@@ -44,8 +45,8 @@ class WmMessageListener : public MessageLoopForUI::Observer {
   virtual void DidProcessEvent(const base::NativeEvent& event) OVERRIDE;
 #else
   // MessageLoopForUI::Observer overrides.
-  virtual void WillProcessEvent(GdkEvent* event);
-  virtual void DidProcessEvent(GdkEvent* event);
+  virtual void WillProcessEvent(GdkEvent* event) OVERRIDE;
+  virtual void DidProcessEvent(GdkEvent* event) OVERRIDE;
 #endif
 
  private:
diff --git a/chrome/browser/chromeos/locale_change_guard.h b/chrome/browser/chromeos/locale_change_guard.h
index d3f19ae..2c9ac6e 100644
--- a/chrome/browser/chromeos/locale_change_guard.h
+++ b/chrome/browser/chromeos/locale_change_guard.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ -50,7 +51,7 @@ class LocaleChangeGuard : public content::NotificationObserver,
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   std::string from_locale_;
   std::string to_locale_;
diff --git a/chrome/browser/chromeos/login/base_login_display_host.h b/chrome/browser/chromeos/login/base_login_display_host.h
index ac8970b..6bdabbf 100644
--- a/chrome/browser/chromeos/login/base_login_display_host.h
+++ b/chrome/browser/chromeos/login/base_login_display_host.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/login/login_display.h"
 #include "chrome/browser/chromeos/login/login_display_host.h"
@@ -34,11 +35,11 @@ class BaseLoginDisplayHost : public LoginDisplayHost,
   }
 
   // LoginDisplayHost implementation:
-  virtual void OnSessionStart();
+  virtual void OnSessionStart() OVERRIDE;
   virtual void StartWizard(
       const std::string& first_screen_name,
-      const GURL& start_url);
-  virtual void StartSignInScreen();
+      const GURL& start_url) OVERRIDE;
+  virtual void StartSignInScreen() OVERRIDE;
 
   // Creates specific WizardController.
   virtual WizardController* CreateWizardController() = 0;
@@ -49,7 +50,7 @@ class BaseLoginDisplayHost : public LoginDisplayHost,
   // content::NotificationObserver implementation:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // Used to calculate position of the screens and background.
   gfx::Rect background_bounds_;
diff --git a/chrome/browser/chromeos/login/camera_controller.h b/chrome/browser/chromeos/login/camera_controller.h
index cf64428..2e12350 100644
--- a/chrome/browser/chromeos/login/camera_controller.h
+++ b/chrome/browser/chromeos/login/camera_controller.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_LOGIN_CAMERA_CONTROLLER_H_
 #pragma once
 
+#include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/chromeos/login/camera.h"
@@ -45,12 +46,12 @@ class CameraController: public Camera::Delegate {
   void GetFrame(SkBitmap* frame) const;
 
   // Camera::Delegate implementation:
-  virtual void OnInitializeSuccess();
-  virtual void OnInitializeFailure();
-  virtual void OnStartCapturingSuccess();
-  virtual void OnStartCapturingFailure();
-  virtual void OnCaptureSuccess();
-  virtual void OnCaptureFailure();
+  virtual void OnInitializeSuccess() OVERRIDE;
+  virtual void OnInitializeFailure() OVERRIDE;
+  virtual void OnStartCapturingSuccess() OVERRIDE;
+  virtual void OnStartCapturingFailure() OVERRIDE;
+  virtual void OnCaptureSuccess() OVERRIDE;
+  virtual void OnCaptureFailure() OVERRIDE;
 
  private:
   // Size of frame we want to receive.
diff --git a/chrome/browser/chromeos/login/captcha_view.h b/chrome/browser/chromeos/login/captcha_view.h
index 0ef4c57..5eacca3 100644
--- a/chrome/browser/chromeos/login/captcha_view.h
+++ b/chrome/browser/chromeos/login/captcha_view.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "chrome/browser/image_decoder.h"
 #include "googleurl/src/gurl.h"
 #include "ui/views/window/dialog_delegate.h"
@@ -50,16 +51,17 @@ class CaptchaView : public views::DialogDelegateView,
 
   // views::TextfieldController:
   virtual void ContentsChanged(views::Textfield* sender,
-                               const string16& new_contents) {}
+                               const string16& new_contents) OVERRIDE {}
   virtual bool HandleKeyEvent(views::Textfield* sender,
-                              const views::KeyEvent& key_event);
+                              const views::KeyEvent& key_event) OVERRIDE;
 
   // ImageDownloader::Delegate:
   virtual void OnImageDecoded(const ImageDecoder* decoder,
-                              const SkBitmap& decoded_image);
+                              const SkBitmap& decoded_image) OVERRIDE;
 
   // views::ButtonListener:
-  virtual void ButtonPressed(views::Button* sender, const views::Event& event);
+  virtual void ButtonPressed(views::Button* sender,
+                             const views::Event& event) OVERRIDE;
 
   // Initializes UI.
   void Init();
@@ -74,10 +76,10 @@ class CaptchaView : public views::DialogDelegateView,
 
  protected:
   // views::View:
-  virtual gfx::Size GetPreferredSize();
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
-                                    views::View* child);
+                                    views::View* child) OVERRIDE;
 
  private:
   Delegate* delegate_;
diff --git a/chrome/browser/chromeos/login/client_login_response_handler.h b/chrome/browser/chromeos/login/client_login_response_handler.h
index cccb1f1..dd1aee9 100644
--- a/chrome/browser/chromeos/login/client_login_response_handler.h
+++ b/chrome/browser/chromeos/login/client_login_response_handler.h
@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "chrome/browser/chromeos/login/auth_response_handler.h"
 
 namespace net {
@@ -28,14 +29,15 @@ class ClientLoginResponseHandler : public AuthResponseHandler {
   virtual ~ClientLoginResponseHandler() {}
 
   // Overridden from AuthResponseHandler.
-  virtual bool CanHandle(const GURL& url);
+  virtual bool CanHandle(const GURL& url) OVERRIDE;
 
   // Overridden from AuthResponseHandler.
   // Takes in a response from ClientLogin, formats into an appropriate query
   // to sent to IssueAuthToken and issues said query.  |catcher| will receive
   // the response to the fetch.
-  virtual content::URLFetcher* Handle(const std::string& to_process,
-                                      content::URLFetcherDelegate* catcher);
+  virtual content::URLFetcher* Handle(
+      const std::string& to_process,
+      content::URLFetcherDelegate* catcher) OVERRIDE;
 
   // exposed for tests.
   std::string payload() { return payload_; }
diff --git a/chrome/browser/chromeos/login/cookie_fetcher.h b/chrome/browser/chromeos/login/cookie_fetcher.h
index d597cca..5d97cab 100644
--- a/chrome/browser/chromeos/login/cookie_fetcher.h
+++ b/chrome/browser/chromeos/login/cookie_fetcher.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/login/auth_response_handler.h"
 #include "chrome/browser/chromeos/login/client_login_response_handler.h"
@@ -42,7 +43,7 @@ class CookieFetcher : public content::URLFetcherDelegate {
   void AttemptFetch(const std::string& credentials);
 
   // Overloaded from content::URLFetcherDelegate.
-  virtual void OnURLFetchComplete(const content::URLFetcher* source);
+  virtual void OnURLFetchComplete(const content::URLFetcher* source) OVERRIDE;
 
  private:
   virtual ~CookieFetcher();
diff --git a/chrome/browser/chromeos/login/cryptohome_op.h b/chrome/browser/chromeos/login/cryptohome_op.h
index d3d81f7..eec093b 100644
--- a/chrome/browser/chromeos/login/cryptohome_op.h
+++ b/chrome/browser/chromeos/login/cryptohome_op.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/chromeos/cros/cryptohome_library.h"
 
@@ -42,7 +43,7 @@ class CryptohomeOp
   virtual void Initiate() = 0;
 
   // Implementation of CryptohomeLibrary::Delegate.
-  virtual void OnComplete(bool success, int return_code);
+  virtual void OnComplete(bool success, int return_code) OVERRIDE;
 
  protected:
   CryptohomeOp(AuthAttemptState* current_attempt,
diff --git a/chrome/browser/chromeos/login/eula_screen.h b/chrome/browser/chromeos/login/eula_screen.h
index a0cdf8c..9293324 100644
--- a/chrome/browser/chromeos/login/eula_screen.h
+++ b/chrome/browser/chromeos/login/eula_screen.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/login/eula_screen_actor.h"
 #include "chrome/browser/chromeos/login/tpm_password_fetcher.h"
@@ -26,17 +27,17 @@ class EulaScreen : public WizardScreen,
   virtual ~EulaScreen();
 
   // WizardScreen implementation:
-  virtual void PrepareToShow();
-  virtual void Show();
-  virtual void Hide();
+  virtual void PrepareToShow() OVERRIDE;
+  virtual void Show() OVERRIDE;
+  virtual void Hide() OVERRIDE;
 
   // EulaScreenActor::Delegate implementation:
-  virtual bool IsTpmEnabled() const;
-  virtual GURL GetOemEulaUrl() const;
-  virtual void OnExit(bool accepted, bool is_usage_stats_checked);
-  virtual void InitiatePasswordFetch();
-  virtual bool IsUsageStatsEnabled() const;
-  virtual void OnActorDestroyed(EulaScreenActor* actor);
+  virtual bool IsTpmEnabled() const OVERRIDE;
+  virtual GURL GetOemEulaUrl() const OVERRIDE;
+  virtual void OnExit(bool accepted, bool is_usage_stats_checked) OVERRIDE;
+  virtual void InitiatePasswordFetch() OVERRIDE;
+  virtual bool IsUsageStatsEnabled() const OVERRIDE;
+  virtual void OnActorDestroyed(EulaScreenActor* actor) OVERRIDE;
 
   // TpmPasswordFetcherDelegate implementation:
   virtual void OnPasswordFetched(const std::string& tpm_password) OVERRIDE;
diff --git a/chrome/browser/chromeos/login/existing_user_controller.h b/chrome/browser/chromeos/login/existing_user_controller.h
index e0ef4ad..ce56ac9 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.h
+++ b/chrome/browser/chromeos/login/existing_user_controller.h
@@ -77,7 +77,7 @@ class ExistingUserController : public LoginDisplay::Delegate,
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // Set a delegate that we will pass LoginStatusConsumer events to.
   // Used for testing.
@@ -101,27 +101,27 @@ class ExistingUserController : public LoginDisplay::Delegate,
   friend class MockLoginPerformerDelegate;
 
   // LoginPerformer::Delegate implementation:
-  virtual void OnLoginFailure(const LoginFailure& error);
+  virtual void OnLoginFailure(const LoginFailure& error) OVERRIDE;
   virtual void OnLoginSuccess(
       const std::string& username,
       const std::string& password,
       const GaiaAuthConsumer::ClientLoginResult& credentials,
       bool pending_requests,
-      bool using_oauth);
-  virtual void OnOffTheRecordLoginSuccess();
+      bool using_oauth) OVERRIDE;
+  virtual void OnOffTheRecordLoginSuccess() OVERRIDE;
   virtual void OnPasswordChangeDetected(
-      const GaiaAuthConsumer::ClientLoginResult& credentials);
-  virtual void WhiteListCheckFailed(const std::string& email);
+      const GaiaAuthConsumer::ClientLoginResult& credentials) OVERRIDE;
+  virtual void WhiteListCheckFailed(const std::string& email) OVERRIDE;
 
   // LoginUtils::Delegate implementation:
-  virtual void OnProfilePrepared(Profile* profile);
+  virtual void OnProfilePrepared(Profile* profile) OVERRIDE;
 
   // CaptchaView::Delegate:
-  virtual void OnCaptchaEntered(const std::string& captcha);
+  virtual void OnCaptchaEntered(const std::string& captcha) OVERRIDE;
 
   // PasswordChangedView::Delegate:
-  virtual void RecoverEncryptedData(const std::string& old_password);
-  virtual void ResyncEncryptedData();
+  virtual void RecoverEncryptedData(const std::string& old_password) OVERRIDE;
+  virtual void ResyncEncryptedData() OVERRIDE;
 
   // Starts WizardController with the specified screen.
   void ActivateWizard(const std::string& screen_name);
diff --git a/chrome/browser/chromeos/login/help_app_launcher.h b/chrome/browser/chromeos/login/help_app_launcher.h
index e3cde29..5ab8b76 100644
--- a/chrome/browser/chromeos/login/help_app_launcher.h
+++ b/chrome/browser/chromeos/login/help_app_launcher.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_LOGIN_HELP_APP_LAUNCHER_H_
 #pragma once
 
+#include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/login/login_html_dialog.h"
@@ -47,7 +48,7 @@ class HelpAppLauncher : public LoginHtmlDialog::Delegate,
 
  protected:
   // LoginHtmlDialog::Delegate implementation:
-  virtual void OnDialogClosed() {}
+  virtual void OnDialogClosed() OVERRIDE {}
 
  private:
   // Shows help topic dialog for specified GURL.
diff --git a/chrome/browser/chromeos/login/helper.h b/chrome/browser/chromeos/login/helper.h
index 3e2d4cf..0021f2b 100644
--- a/chrome/browser/chromeos/login/helper.h
+++ b/chrome/browser/chromeos/login/helper.h
@@ -8,6 +8,7 @@
 #define CHROME_BROWSER_CHROMEOS_LOGIN_HELPER_H_
 #pragma once
 
+#include "base/compiler_specific.h"
 #include "base/string16.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "views/controls/button/text_button.h"
@@ -159,7 +160,7 @@ class WideButton : public views::NativeTextButton {
   virtual ~WideButton() {}
 
  private:
-  virtual gfx::Size GetPreferredSize();
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(WideButton);
 };
diff --git a/chrome/browser/chromeos/login/html_page_screen.h b/chrome/browser/chromeos/login/html_page_screen.h
index ff6d1d5..f374afa 100644
--- a/chrome/browser/chromeos/login/html_page_screen.h
+++ b/chrome/browser/chromeos/login/html_page_screen.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/login/screen_observer.h"
 #include "chrome/browser/chromeos/login/view_screen.h"
@@ -25,7 +26,7 @@ class HTMLPageDomView : public WebPageDomView {
  protected:
   // Overriden from DOMView:
   virtual TabContents* CreateTabContents(Profile* profile,
-                                         SiteInstance* instance);
+                                         SiteInstance* instance) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(HTMLPageDomView);
@@ -36,7 +37,7 @@ class HTMLPageView : public WebPageView {
   HTMLPageView();
 
  protected:
-  virtual WebPageDomView* dom_view();
+  virtual WebPageDomView* dom_view() OVERRIDE;
 
  private:
   // View that renders page.
@@ -55,23 +56,24 @@ class HTMLPageScreen : public ViewScreen<HTMLPageView>,
   virtual ~HTMLPageScreen();
 
   // WebPageDelegate implementation:
-  virtual void OnPageLoaded();
-  virtual void OnPageLoadFailed(const std::string& url);
+  virtual void OnPageLoaded() OVERRIDE;
+  virtual void OnPageLoadFailed(const std::string& url) OVERRIDE;
 
  protected:
   // Overrides WebPageScreen:
-  virtual void OnNetworkTimeout();
+  virtual void OnNetworkTimeout() OVERRIDE;
 
  private:
   // ViewScreen implementation:
-  virtual void CreateView();
-  virtual void Refresh();
-  virtual HTMLPageView* AllocateView();
+  virtual void CreateView() OVERRIDE;
+  virtual void Refresh() OVERRIDE;
+  virtual HTMLPageView* AllocateView() OVERRIDE;
 
-  virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);
+  virtual void HandleKeyboardEvent(
+      const NativeWebKeyboardEvent& event) OVERRIDE;
 
   // WebPageScreen implementation:
-  virtual void CloseScreen(ScreenObserver::ExitCodes code);
+  virtual void CloseScreen(ScreenObserver::ExitCodes code) OVERRIDE;
 
   // URL to navigate.
   std::string url_;
diff --git a/chrome/browser/chromeos/login/image_downloader.h b/chrome/browser/chromeos/login/image_downloader.h
index 02b1f84..b954635 100644
--- a/chrome/browser/chromeos/login/image_downloader.h
+++ b/chrome/browser/chromeos/login/image_downloader.h
@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/image_decoder.h"
 #include "content/public/common/url_fetcher_delegate.h"
@@ -29,7 +30,7 @@ class ImageDownloader : public content::URLFetcherDelegate {
 
  private:
   // Overriden from content::URLFetcherDelegate:
-  virtual void OnURLFetchComplete(const content::URLFetcher* source);
+  virtual void OnURLFetchComplete(const content::URLFetcher* source) OVERRIDE;
 
   ImageDecoder::Delegate* delegate_;
   scoped_ptr<content::URLFetcher> image_fetcher_;
diff --git a/chrome/browser/chromeos/login/issue_response_handler.h b/chrome/browser/chromeos/login/issue_response_handler.h
index 17e9db7..809194d 100644
--- a/chrome/browser/chromeos/login/issue_response_handler.h
+++ b/chrome/browser/chromeos/login/issue_response_handler.h
@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "chrome/browser/chromeos/login/auth_response_handler.h"
 
 namespace net {
@@ -29,15 +30,16 @@ class IssueResponseHandler : public AuthResponseHandler {
   virtual ~IssueResponseHandler() {}
 
   // Overridden from AuthResponseHandler.
-  virtual bool CanHandle(const GURL& url);
+  virtual bool CanHandle(const GURL& url) OVERRIDE;
 
   // Overridden from AuthResponseHandler.
   // Takes in a response from IssueAuthToken, formats into an appropriate query
   // to sent to TokenAuth, and issues said query.  |catcher| will receive
   // the response to the fetch.  This fetch will follow redirects, which is
   // necesary to support GAFYD and corp accounts.
-  virtual content::URLFetcher* Handle(const std::string& to_process,
-                                      content::URLFetcherDelegate* catcher);
+  virtual content::URLFetcher* Handle(
+      const std::string& to_process,
+      content::URLFetcherDelegate* catcher) OVERRIDE;
 
   // exposed for testing
   std::string token_url() { return token_url_; }
diff --git a/chrome/browser/chromeos/login/login_html_dialog.h b/chrome/browser/chromeos/login/login_html_dialog.h
index a02966c..a1b4381 100644
--- a/chrome/browser/chromeos/login/login_html_dialog.h
+++ b/chrome/browser/chromeos/login/login_html_dialog.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "chrome/browser/ui/webui/html_dialog_ui.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ -71,7 +72,7 @@ class LoginHtmlDialog : public HtmlDialogUIDelegate,
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
  private:
   // Notifications receiver.
diff --git a/chrome/browser/chromeos/login/message_bubble.h b/chrome/browser/chromeos/login/message_bubble.h
index 2501212..4527132 100644
--- a/chrome/browser/chromeos/login/message_bubble.h
+++ b/chrome/browser/chromeos/login/message_bubble.h
@@ -87,7 +87,7 @@ class MessageBubble : public Bubble,
 
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender,
-                             const views::Event& event);
+                             const views::Event& event) OVERRIDE;
 
   // Overridden from views::LinkListener:
   virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
diff --git a/chrome/browser/chromeos/login/network_screen.h b/chrome/browser/chromeos/login/network_screen.h
index 0a8fda3..04c6ab6 100644
--- a/chrome/browser/chromeos/login/network_screen.h
+++ b/chrome/browser/chromeos/login/network_screen.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_LOGIN_NETWORK_SCREEN_H_
 #pragma once
 
+#include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/string16.h"
 #include "base/task.h"
@@ -26,15 +27,15 @@ class NetworkScreen : public WizardScreen,
   virtual ~NetworkScreen();
 
   // WizardScreen implementation:
-  virtual void PrepareToShow();
-  virtual void Show();
-  virtual void Hide();
+  virtual void PrepareToShow() OVERRIDE;
+  virtual void Show() OVERRIDE;
+  virtual void Hide() OVERRIDE;
 
   // NetworkLibrary::NetworkManagerObserver implementation:
-  virtual void OnNetworkManagerChanged(NetworkLibrary* network_lib);
+  virtual void OnNetworkManagerChanged(NetworkLibrary* network_lib) OVERRIDE;
 
   // NetworkScreenActor::Delegate implementation:
-  virtual void OnContinuePressed();
+  virtual void OnContinuePressed() OVERRIDE;
 
   NetworkScreenActor* actor() const { return actor_; }
 
diff --git a/chrome/browser/chromeos/login/ownership_service.h b/chrome/browser/chromeos/login/ownership_service.h
index 52a3d77..989f597 100644
--- a/chrome/browser/chromeos/login/ownership_service.h
+++ b/chrome/browser/chromeos/login/ownership_service.h
@@ -10,6 +10,7 @@
 #include <vector>
 
 #include "base/callback.h"
+#include "base/compiler_specific.h"
 #include "base/synchronization/lock.h"
 #include "chrome/browser/chromeos/login/owner_key_utils.h"
 #include "chrome/browser/chromeos/login/owner_manager.h"
@@ -104,7 +105,7 @@ class OwnershipService : public content::NotificationObserver {
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
  private:
   friend struct base::DefaultLazyInstanceTraits<OwnershipService>;
diff --git a/chrome/browser/chromeos/login/password_changed_view.h b/chrome/browser/chromeos/login/password_changed_view.h
index 7417672..a5936d9 100644
--- a/chrome/browser/chromeos/login/password_changed_view.h
+++ b/chrome/browser/chromeos/login/password_changed_view.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "ui/views/window/dialog_delegate.h"
 #include "views/controls/button/button.h"
 #include "views/controls/textfield/textfield_controller.h"
@@ -58,20 +59,20 @@ class PasswordChangedView : public views::DialogDelegateView,
 
   // views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender,
-                             const views::Event& event)  OVERRIDE;
+                             const views::Event& event) OVERRIDE;
 
   // views::TextfieldController:
   virtual bool HandleKeyEvent(views::Textfield* sender,
-                              const views::KeyEvent& keystroke)  OVERRIDE;
+                              const views::KeyEvent& keystroke) OVERRIDE;
   virtual void ContentsChanged(views::Textfield* sender,
-                               const string16& new_contents)  OVERRIDE {}
+                               const string16& new_contents) OVERRIDE {}
 
  protected:
   // views::View:
-  virtual gfx::Size GetPreferredSize();
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
-                                    views::View* child);
+                                    views::View* child) OVERRIDE;
 
  private:
   // Called when dialog is accepted.
diff --git a/chrome/browser/chromeos/login/registration_screen.h b/chrome/browser/chromeos/login/registration_screen.h
index 0ac81c3..cb32f21 100644
--- a/chrome/browser/chromeos/login/registration_screen.h
+++ b/chrome/browser/chromeos/login/registration_screen.h
@@ -35,7 +35,7 @@ class RegistrationDomView : public WebPageDomView {
  protected:
   // Overriden from DOMView:
   virtual TabContents* CreateTabContents(Profile* profile,
-                                         SiteInstance* instance);
+                                         SiteInstance* instance) OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(RegistrationDomView);
 };
@@ -46,7 +46,7 @@ class RegistrationView : public WebPageView {
   RegistrationView() : dom_view_(new RegistrationDomView()) {}
 
  protected:
-  virtual WebPageDomView* dom_view();
+  virtual WebPageDomView* dom_view() OVERRIDE;
 
  private:
   // View that renders page.
@@ -76,9 +76,9 @@ class RegistrationScreen : public ViewScreen<RegistrationView>,
 
  private:
   // ViewScreen implementation:
-  virtual void CreateView();
-  virtual void Refresh();
-  virtual RegistrationView* AllocateView();
+  virtual void CreateView() OVERRIDE;
+  virtual void Refresh() OVERRIDE;
+  virtual RegistrationView* AllocateView() OVERRIDE;
 
   // TabContentsDelegate implementation:
   // Deprecated. Please use two-argument variant.
@@ -92,10 +92,11 @@ class RegistrationScreen : public ViewScreen<RegistrationView>,
   virtual TabContents* OpenURLFromTab(TabContents* source,
                                       const OpenURLParams& params) OVERRIDE;
 
-  virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);
+  virtual void HandleKeyboardEvent(
+      const NativeWebKeyboardEvent& event) OVERRIDE;
 
   // WebPageScreen implementation:
-  virtual void CloseScreen(ScreenObserver::ExitCodes code);
+  virtual void CloseScreen(ScreenObserver::ExitCodes code) OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(RegistrationScreen);
 };
diff --git a/chrome/browser/chromeos/login/screen_lock_view.h b/chrome/browser/chromeos/login/screen_lock_view.h
index 86ed913..681b010 100644
--- a/chrome/browser/chromeos/login/screen_lock_view.h
+++ b/chrome/browser/chromeos/login/screen_lock_view.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_LOGIN_SCREEN_LOCK_VIEW_H_
 #pragma once
 
+#include "base/compiler_specific.h"
 #include "chrome/browser/chromeos/login/helper.h"
 #include "chrome/browser/chromeos/login/user_view.h"
 #include "content/public/browser/notification_observer.h"
@@ -45,23 +46,23 @@ class ScreenLockView : public ThrobberHostView,
 
   // views::View:
   virtual void SetEnabled(bool enabled);
-  virtual void Layout();
-  virtual gfx::Size GetPreferredSize();
+  virtual void Layout() OVERRIDE;
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
 
   // content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // views::TextfieldController:
   virtual void ContentsChanged(views::Textfield* sender,
-                               const string16& new_contents);
+                               const string16& new_contents) OVERRIDE;
   virtual bool HandleKeyEvent(views::Textfield* sender,
-                              const views::KeyEvent& keystroke);
+                              const views::KeyEvent& keystroke) OVERRIDE;
 
   // UserView::Delegate:
-  virtual void OnSignout();
-  virtual bool IsUserSelected() const;
+  virtual void OnSignout() OVERRIDE;
+  virtual bool IsUserSelected() const OVERRIDE;
 
  private:
   friend class test::ScreenLockerTester;
diff --git a/chrome/browser/chromeos/login/signed_settings.h b/chrome/browser/chromeos/login/signed_settings.h
index 43e6f05..4e6b79f 100644
--- a/chrome/browser/chromeos/login/signed_settings.h
+++ b/chrome/browser/chromeos/login/signed_settings.h
@@ -9,6 +9,7 @@
 #include <string>
 #include <vector>
 
+#include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/chromeos/login/owner_manager.h"
 
@@ -115,8 +116,9 @@ class SignedSettings : public base::RefCountedThreadSafe<SignedSettings>,
     explicit Relay(SignedSettings* s);
     virtual ~Relay();
     // Implementation of SignedSettings::Delegate
-    virtual void OnSettingsOpCompleted(SignedSettings::ReturnCode code,
-                                       const em::PolicyFetchResponse& value);
+    virtual void OnSettingsOpCompleted(
+        SignedSettings::ReturnCode code,
+        const em::PolicyFetchResponse& value) OVERRIDE;
    private:
     SignedSettings* settings_;
     DISALLOW_COPY_AND_ASSIGN(Relay);
diff --git a/chrome/browser/chromeos/login/take_photo_view.h b/chrome/browser/chromeos/login/take_photo_view.h
index 37653a1..1091104 100644
--- a/chrome/browser/chromeos/login/take_photo_view.h
+++ b/chrome/browser/chromeos/login/take_photo_view.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_LOGIN_TAKE_PHOTO_VIEW_H_
 #pragma once
 
+#include "base/compiler_specific.h"
 #include "views/controls/button/button.h"
 #include "views/view.h"
 
@@ -64,10 +65,11 @@ class TakePhotoView : public views::View,
   void CaptureImage();
 
   // Overridden from views::View:
-  virtual gfx::Size GetPreferredSize();
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
 
   // Overridden from views::ButtonListener.
-  virtual void ButtonPressed(views::Button* sender, const views::Event& event);
+  virtual void ButtonPressed(views::Button* sender,
+                             const views::Event& event) OVERRIDE;
 
   bool is_capturing() const { return is_capturing_; }
 
diff --git a/chrome/browser/chromeos/login/test_attempt_state.h b/chrome/browser/chromeos/login/test_attempt_state.h
index 610e73c..9303d43 100644
--- a/chrome/browser/chromeos/login/test_attempt_state.h
+++ b/chrome/browser/chromeos/login/test_attempt_state.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.
 
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "chrome/browser/chromeos/login/auth_attempt_state.h"
 #include "chrome/browser/chromeos/login/login_status_consumer.h"
 #include "chrome/common/net/gaia/gaia_auth_consumer.h"
@@ -39,14 +40,14 @@ class TestAttemptState : public AuthAttemptState {
   void PresetCryptohomeStatus(bool cryptohome_outcome, int cryptohome_code);
 
   // To allow state to be queried on the main thread during tests.
-  virtual bool online_complete();
-  virtual const LoginFailure& online_outcome();
-  virtual const GaiaAuthConsumer::ClientLoginResult& credentials();
-  virtual bool is_first_time_user();
-  virtual GaiaAuthFetcher::HostedAccountsSetting hosted_policy();
-  virtual bool cryptohome_complete();
-  virtual bool cryptohome_outcome();
-  virtual int cryptohome_code();
+  virtual bool online_complete() OVERRIDE;
+  virtual const LoginFailure& online_outcome() OVERRIDE;
+  virtual const GaiaAuthConsumer::ClientLoginResult& credentials() OVERRIDE;
+  virtual bool is_first_time_user() OVERRIDE;
+  virtual GaiaAuthFetcher::HostedAccountsSetting hosted_policy() OVERRIDE;
+  virtual bool cryptohome_complete() OVERRIDE;
+  virtual bool cryptohome_outcome() OVERRIDE;
+  virtual int cryptohome_code() OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestAttemptState);
diff --git a/chrome/browser/chromeos/login/textfield_with_margin.h b/chrome/browser/chromeos/login/textfield_with_margin.h
index 9655f27..ac76a09 100644
--- a/chrome/browser/chromeos/login/textfield_with_margin.h
+++ b/chrome/browser/chromeos/login/textfield_with_margin.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_CHROMEOS_LOGIN_TEXTFIELD_WITH_MARGIN_H_
 #pragma once
 
+#include "base/compiler_specific.h"
 #include "views/controls/textfield/textfield.h"
 
 namespace chromeos {
@@ -19,8 +20,8 @@ class TextfieldWithMargin : public views::Textfield {
 
  protected:
   // Overridden from views::View:
-  virtual void Layout();
-  virtual bool OnKeyPressed(const views::KeyEvent& e);
+  virtual void Layout() OVERRIDE;
+  virtual bool OnKeyPressed(const views::KeyEvent& e) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TextfieldWithMargin);
diff --git a/chrome/browser/chromeos/login/update_screen.h b/chrome/browser/chromeos/login/update_screen.h
index 050b584..eb3c32f 100644
--- a/chrome/browser/chromeos/login/update_screen.h
+++ b/chrome/browser/chromeos/login/update_screen.h
@@ -8,6 +8,7 @@
 
 #include <set>
 
+#include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer.h"
@@ -30,9 +31,9 @@ class UpdateScreen: public UpdateEngineClient::Observer,
   virtual ~UpdateScreen();
 
   // Overridden from WizardScreen.
-  virtual void PrepareToShow();
-  virtual void Show();
-  virtual void Hide();
+  virtual void PrepareToShow() OVERRIDE;
+  virtual void Show() OVERRIDE;
+  virtual void Hide() OVERRIDE;
 
   // UpdateScreenActor::Delegate implementation:
   virtual void CancelUpdate() OVERRIDE;
diff --git a/chrome/browser/chromeos/login/user_image_loader.h b/chrome/browser/chromeos/login/user_image_loader.h
index a3212ac5..ed8d889 100644
--- a/chrome/browser/chromeos/login/user_image_loader.h
+++ b/chrome/browser/chromeos/login/user_image_loader.h
@@ -10,6 +10,7 @@
 #include <string>
 
 #include "base/callback.h"
+#include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/image_decoder.h"
 
@@ -56,8 +57,8 @@ class UserImageLoader : public base::RefCountedThreadSafe<UserImageLoader>,
 
   // ImageDecoder::Delegate implementation.
   virtual void OnImageDecoded(const ImageDecoder* decoder,
-                              const SkBitmap& decoded_image);
-  virtual void OnDecodeImageFailed(const ImageDecoder* decoder);
+                              const SkBitmap& decoded_image) OVERRIDE;
+  virtual void OnDecodeImageFailed(const ImageDecoder* decoder) OVERRIDE;
 
   // The message loop object of the thread in which we notify the delegate.
   MessageLoop* target_message_loop_;
diff --git a/chrome/browser/chromeos/login/web_page_view.h b/chrome/browser/chromeos/login/web_page_view.h
index 566b47c..b7635c0 100644
--- a/chrome/browser/chromeos/login/web_page_view.h
+++ b/chrome/browser/chromeos/login/web_page_view.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "base/timer.h"
 #include "chrome/browser/ui/views/dom_view.h"
 #include "content/browser/tab_contents/tab_contents.h"
@@ -115,7 +116,7 @@ class WebPageView : public views::View {
 
  private:
   // Overriden from views::View:
-  virtual void Layout();
+  virtual void Layout() OVERRIDE;
 
   // Called by stop_timer_. Shows rendered page.
   void ShowRenderedPage();
diff --git a/chrome/browser/chromeos/login/webui_screen_locker.h b/chrome/browser/chromeos/login/webui_screen_locker.h
index 70e3df9..59be0e3 100644
--- a/chrome/browser/chromeos/login/webui_screen_locker.h
+++ b/chrome/browser/chromeos/login/webui_screen_locker.h
@@ -65,7 +65,7 @@ class WebUIScreenLocker : public WebUILoginView,
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
  private:
   virtual ~WebUIScreenLocker();
diff --git a/chrome/browser/chromeos/login/wizard_accessibility_handler.h b/chrome/browser/chromeos/login/wizard_accessibility_handler.h
index 804a6de..5aba1f6 100644
--- a/chrome/browser/chromeos/login/wizard_accessibility_handler.h
+++ b/chrome/browser/chromeos/login/wizard_accessibility_handler.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_source.h"
@@ -43,7 +44,7 @@ class WizardAccessibilityHandler : public content::NotificationObserver {
   // Override from content::NotificationObserver.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // Get text to speak and an earcon identifier (which may be NONE) for any
   // accessibility event.
diff --git a/chrome/browser/chromeos/login/wizard_controller.h b/chrome/browser/chromeos/login/wizard_controller.h
index 83e9c56..1f929a9 100644
--- a/chrome/browser/chromeos/login/wizard_controller.h
+++ b/chrome/browser/chromeos/login/wizard_controller.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer.h"
@@ -148,12 +149,12 @@ class WizardController : public ScreenObserver {
   void InitiateOOBEUpdate();
 
   // Overridden from ScreenObserver:
-  virtual void OnExit(ExitCodes exit_code);
-  virtual void ShowCurrentScreen();
+  virtual void OnExit(ExitCodes exit_code) OVERRIDE;
+  virtual void ShowCurrentScreen() OVERRIDE;
   virtual void OnSetUserNamePassword(const std::string& username,
-                                     const std::string& password);
-  virtual void set_usage_statistics_reporting(bool val);
-  virtual bool usage_statistics_reporting() const;
+                                     const std::string& password) OVERRIDE;
+  virtual void set_usage_statistics_reporting(bool val) OVERRIDE;
+  virtual bool usage_statistics_reporting() const OVERRIDE;
 
   // Switches from one screen to another.
   void SetCurrentScreen(WizardScreen* screen);
diff --git a/chrome/browser/chromeos/low_battery_observer.h b/chrome/browser/chromeos/low_battery_observer.h
index dc08fe6..49f41db 100644
--- a/chrome/browser/chromeos/low_battery_observer.h
+++ b/chrome/browser/chromeos/low_battery_observer.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/time.h"
 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/chromeos/notifications/system_notification.h"
@@ -24,7 +25,7 @@ class LowBatteryObserver : public PowerManagerClient::Observer {
   virtual ~LowBatteryObserver();
 
  private:
-  virtual void PowerChanged(const PowerSupplyStatus& power_status);
+  virtual void PowerChanged(const PowerSupplyStatus& power_status) OVERRIDE;
 
   void Show(base::TimeDelta remaining, bool urgent);
   void Hide();
diff --git a/chrome/browser/chromeos/media/media_player.h b/chrome/browser/chromeos/media/media_player.h
index c7ab976..53e1fb8 100644
--- a/chrome/browser/chromeos/media/media_player.h
+++ b/chrome/browser/chromeos/media/media_player.h
@@ -9,6 +9,7 @@
 #include <set>
 #include <vector>
 
+#include "base/compiler_specific.h"
 #include "base/memory/singleton.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ -86,18 +87,20 @@ class MediaPlayer : public content::NotificationObserver,
   // Always returns NULL because we don't want to attempt a redirect
   // before seeing the detected mime type of the request.
   // Implementation of net::URLRequest::Interceptor.
-  virtual net::URLRequestJob* MaybeIntercept(net::URLRequest* request);
+  virtual net::URLRequestJob* MaybeIntercept(
+      net::URLRequest* request) OVERRIDE;
 
   // Determines if the requested document can be viewed by the
   // MediaPlayer.  If it can, returns a net::URLRequestJob that
   // redirects the browser to the view URL.
   // Implementation of net::URLRequest::Interceptor.
-  virtual net::URLRequestJob* MaybeInterceptResponse(net::URLRequest* request);
+  virtual net::URLRequestJob* MaybeInterceptResponse(
+      net::URLRequest* request) OVERRIDE;
 
   // Used to detect when the mediaplayer is closed.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // Getter for the singleton.
   static MediaPlayer* GetInstance();
diff --git a/chrome/browser/chromeos/network_login_observer.h b/chrome/browser/chromeos/network_login_observer.h
index d91f1eb..0867c78 100644
--- a/chrome/browser/chromeos/network_login_observer.h
+++ b/chrome/browser/chromeos/network_login_observer.h
@@ -10,6 +10,7 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 
 namespace views {
@@ -30,7 +31,7 @@ class NetworkLoginObserver : public NetworkLibrary::NetworkManagerObserver {
   void CreateModalPopup(views::WidgetDelegate* view);
 
   // NetworkLibrary::NetworkManagerObserver implementation.
-  virtual void OnNetworkManagerChanged(NetworkLibrary* obj);
+  virtual void OnNetworkManagerChanged(NetworkLibrary* obj) OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkLoginObserver);
 };
diff --git a/chrome/browser/chromeos/network_message_observer.h b/chrome/browser/chromeos/network_message_observer.h
index 781601a..8b48c27 100644
--- a/chrome/browser/chromeos/network_message_observer.h
+++ b/chrome/browser/chromeos/network_message_observer.h
@@ -10,6 +10,7 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "chrome/browser/chromeos/notifications/system_notification.h"
@@ -41,12 +42,12 @@ class NetworkMessageObserver
   virtual void ShowLowDataNotification(const CellularDataPlan* plan);
 
   // NetworkLibrary::NetworkManagerObserver implementation.
-  virtual void OnNetworkManagerChanged(NetworkLibrary* obj);
+  virtual void OnNetworkManagerChanged(NetworkLibrary* obj) OVERRIDE;
   // NetworkLibrary::CellularDataPlanObserver implementation.
-  virtual void OnCellularDataPlanChanged(NetworkLibrary* obj);
+  virtual void OnCellularDataPlanChanged(NetworkLibrary* obj) OVERRIDE;
   // NetworkLibrary::UserActionObserver implementation.
   virtual void OnConnectionInitiated(NetworkLibrary* obj,
-                                     const Network* network);
+                                     const Network* network) OVERRIDE;
 
   // Saves the current cellular and plan information.
   // |plan| can be NULL. In that case, we set it to unknown.
diff --git a/chrome/browser/chromeos/notifications/balloon_view.h b/chrome/browser/chromeos/notifications/balloon_view.h
index 879f4f4..552a4b9 100644
--- a/chrome/browser/chromeos/notifications/balloon_view.h
+++ b/chrome/browser/chromeos/notifications/balloon_view.h
@@ -9,6 +9,7 @@
 #pragma once
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/notifications/balloon.h"
@@ -41,16 +42,18 @@ class BalloonViewImpl : public BalloonView,
   virtual ~BalloonViewImpl();
 
   // views::View interface.
-  virtual void Layout();
-  virtual void ViewHierarchyChanged(bool is_add, View* parent, View* child);
+  virtual void Layout() OVERRIDE;
+  virtual void ViewHierarchyChanged(bool is_add,
+                                    View* parent,
+                                    View* child) OVERRIDE;
 
   // BalloonView interface.
-  virtual void Show(Balloon* balloon);
-  virtual void Update();
-  virtual void Close(bool by_user);
-  virtual void RepositionToBalloon();
-  virtual gfx::Size GetSize() const;
-  virtual BalloonHost* GetHost() const;
+  virtual void Show(Balloon* balloon) OVERRIDE;
+  virtual void Update() OVERRIDE;
+  virtual void Close(bool by_user) OVERRIDE;
+  virtual void RepositionToBalloon() OVERRIDE;
+  virtual gfx::Size GetSize() const OVERRIDE;
+  virtual BalloonHost* GetHost() const OVERRIDE;
 
   // True if the notification is stale. False if the notification is new.
   bool stale() const { return stale_; }
@@ -77,12 +80,12 @@ class BalloonViewImpl : public BalloonView,
   friend class NotificationControlView;
 
   // views::View interface.
-  virtual gfx::Size GetPreferredSize();
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
 
   // content::NotificationObserver interface.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // Initializes the options menu.
   void CreateOptionsMenu();
diff --git a/chrome/browser/chromeos/notifications/system_notification.h b/chrome/browser/chromeos/notifications/system_notification.h
index d140219..d7e0811 100644
--- a/chrome/browser/chromeos/notifications/system_notification.h
+++ b/chrome/browser/chromeos/notifications/system_notification.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "base/basictypes.h"
 #include "base/string16.h"
 #include "chrome/browser/chromeos/notifications/balloon_view_host.h"  // MessageCallback
@@ -66,11 +67,11 @@ class SystemNotification {
   class Delegate : public NotificationDelegate {
    public:
     explicit Delegate(const std::string& id);
-    virtual void Display() {}
-    virtual void Error() {}
-    virtual void Close(bool by_user) {}
-    virtual void Click() {}
-    virtual std::string id() const;
+    virtual void Display() OVERRIDE {}
+    virtual void Error() OVERRIDE {}
+    virtual void Close(bool by_user) OVERRIDE {}
+    virtual void Click() OVERRIDE {}
+    virtual std::string id() const OVERRIDE;
 
    private:
     std::string id_;
diff --git a/chrome/browser/chromeos/offline/offline_load_page.h b/chrome/browser/chromeos/offline/offline_load_page.h
index fc1ab22..1271029 100644
--- a/chrome/browser/chromeos/offline/offline_load_page.h
+++ b/chrome/browser/chromeos/offline/offline_load_page.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "base/task.h"
 #include "chrome/browser/tab_contents/chrome_interstitial_page.h"
 #include "net/base/network_change_notifier.h"
@@ -41,10 +42,10 @@ class OfflineLoadPage : public ChromeInterstitialPage,
 
  private:
   // ChromeInterstitialPage implementation.
-  virtual std::string GetHTMLContents();
-  virtual void CommandReceived(const std::string& command);
-  virtual void Proceed();
-  virtual void DontProceed();
+  virtual std::string GetHTMLContents() OVERRIDE;
+  virtual void CommandReceived(const std::string& command) OVERRIDE;
+  virtual void Proceed() OVERRIDE;
+  virtual void DontProceed() OVERRIDE;
 
   // net::NetworkChangeNotifier::OnlineStateObserver overrides.
   virtual void OnOnlineStateChanged(bool online) OVERRIDE;
diff --git a/chrome/browser/chromeos/options/network_config_view.h b/chrome/browser/chromeos/options/network_config_view.h
index 546337d..2288ac0 100644
--- a/chrome/browser/chromeos/options/network_config_view.h
+++ b/chrome/browser/chromeos/options/network_config_view.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "base/string16.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 #include "ui/gfx/native_widget_types.h"  // gfx::NativeWindow
@@ -73,11 +74,11 @@ class NetworkConfigView : public views::DialogDelegateView,
 
  protected:
   // views::View overrides:
-  virtual void Layout();
-  virtual gfx::Size GetPreferredSize();
+  virtual void Layout() OVERRIDE;
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
-                                    views::View* child);
+                                    views::View* child) OVERRIDE;
 
  private:
   // Creates an "Advanced" button in the lower-left corner of the dialog.
diff --git a/chrome/browser/chromeos/options/take_photo_dialog.h b/chrome/browser/chromeos/options/take_photo_dialog.h
index ccb0973..d52b194 100644
--- a/chrome/browser/chromeos/options/take_photo_dialog.h
+++ b/chrome/browser/chromeos/options/take_photo_dialog.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_OPTIONS_TAKE_PHOTO_DIALOG_H_
 #pragma once
 
+#include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "chrome/browser/chromeos/login/camera_controller.h"
@@ -88,12 +89,12 @@ class TakePhotoDialog : public views::DialogDelegateView,
   // content::NotificationObserver implementation:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
  protected:
   // views::View overrides:
-  virtual void Layout();
-  virtual gfx::Size GetPreferredSize();
+  virtual void Layout() OVERRIDE;
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
 
  private:
   // Starts initializing the camera and shows the appropriate status on the
diff --git a/chrome/browser/chromeos/panels/panel_scroller.h b/chrome/browser/chromeos/panels/panel_scroller.h
index 337c299..75834fb 100644
--- a/chrome/browser/chromeos/panels/panel_scroller.h
+++ b/chrome/browser/chromeos/panels/panel_scroller.h
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/base/animation/slide_animation.h"
 #include "views/view.h"
@@ -39,7 +40,7 @@ class PanelScroller : public views::View, public ui::AnimationDelegate {
   struct Panel;
 
   // ui::AnimationDelegate overrides.
-  virtual void AnimationProgressed(const ui::Animation* animation);
+  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
 
   // Scrolls to the panel at the given index. It will be moved to the top.
   void ScrollToPanel(int index);
diff --git a/chrome/browser/chromeos/panels/panel_scroller_container.h b/chrome/browser/chromeos/panels/panel_scroller_container.h
index 5ff9a09..57c7983 100644
--- a/chrome/browser/chromeos/panels/panel_scroller_container.h
+++ b/chrome/browser/chromeos/panels/panel_scroller_container.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.
 
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "views/view.h"
 
 class PanelScroller;
@@ -21,9 +22,9 @@ class PanelScrollerContainer : public views::View {
   int HeaderSize() const;
 
   // view::View overrides.
-  virtual gfx::Size GetPreferredSize();
-  virtual void Layout();
-  virtual void OnPaint(gfx::Canvas* canvas);
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
+  virtual void Layout() OVERRIDE;
+  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
  private:
   // Non-owning pointer to our parent scroller object.
diff --git a/chrome/browser/chromeos/panels/panel_scroller_header.h b/chrome/browser/chromeos/panels/panel_scroller_header.h
index f00f3ff..de2c682 100644
--- a/chrome/browser/chromeos/panels/panel_scroller_header.h
+++ b/chrome/browser/chromeos/panels/panel_scroller_header.h
@@ -7,6 +7,7 @@
 #pragma once
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/string16.h"
 #include "views/view.h"
 
@@ -24,8 +25,8 @@ class PanelScrollerHeader : public views::View {
   virtual bool OnMouseDragged(const views::MouseEvent& event) OVERRIDE;
   virtual void OnMouseReleased(const views::MouseEvent& event) OVERRIDE;
   virtual void OnMouseCaptureLost() OVERRIDE;
-  virtual gfx::Size GetPreferredSize();
-  virtual void OnPaint(gfx::Canvas* canvas);
+  virtual gfx::Size GetPreferredSize() OVERRIDE;
+  virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
 
  private:
   // Non-owning pointer to our parent scroller object.
diff --git a/chrome/browser/chromeos/preferences.h b/chrome/browser/chromeos/preferences.h
index 3566986..e8b0636 100644
--- a/chrome/browser/chromeos/preferences.h
+++ b/chrome/browser/chromeos/preferences.h
@@ -9,6 +9,7 @@
 #include <string>
 #include <vector>
 
+#include "base/compiler_specific.h"
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "content/public/browser/notification_observer.h"
@@ -39,7 +40,7 @@ class Preferences : public content::NotificationObserver {
   // Overridden from content::NotificationObserver:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
  private:
   // This will set the OS settings when the preference changes.
diff --git a/chrome/browser/chromeos/sms_observer.h b/chrome/browser/chromeos/sms_observer.h
index 2e5de8b3..6c3bc07 100644
--- a/chrome/browser/chromeos/sms_observer.h
+++ b/chrome/browser/chromeos/sms_observer.h
@@ -10,6 +10,7 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
 
 class Profile;
@@ -29,7 +30,7 @@ class SmsObserver : public NetworkLibrary::NetworkManagerObserver {
   typedef std::map<std::string, SMSHandler*> ObserversMap;
 
   // NetworkLibrary:NetworkManagerObserver implementation:
-  virtual void OnNetworkManagerChanged(NetworkLibrary* obj);
+  virtual void OnNetworkManagerChanged(NetworkLibrary* obj) OVERRIDE;
 
   static void StaticCallback(void* object,
                              const char* modem_device_path,
diff --git a/chrome/browser/chromeos/status/caps_lock_menu_button.h b/chrome/browser/chromeos/status/caps_lock_menu_button.h
index 1f2e243..8dadf21 100644
--- a/chrome/browser/chromeos/status/caps_lock_menu_button.h
+++ b/chrome/browser/chromeos/status/caps_lock_menu_button.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "base/timer.h"
 #include "chrome/browser/chromeos/status/status_area_button.h"
 #include "chrome/browser/chromeos/system_key_event_listener.h"
@@ -39,21 +40,22 @@ class CapsLockMenuButton : public content::NotificationObserver,
   virtual ~CapsLockMenuButton();
 
   // views::View implementation.
-  virtual void OnLocaleChanged();
+  virtual void OnLocaleChanged() OVERRIDE;
 
   // views::MenuDelegate implementation.
-  virtual string16 GetLabel(int id) const;
+  virtual string16 GetLabel(int id) const OVERRIDE;
 
   // views::ViewMenuDelegate implementation.
-  virtual void RunMenu(views::View* unused_source, const gfx::Point& pt);
+  virtual void RunMenu(views::View* unused_source,
+                       const gfx::Point& pt) OVERRIDE;
 
   // SystemKeyEventListener::CapsLockObserver implementation
-  virtual void OnCapsLockChange(bool enabled);
+  virtual void OnCapsLockChange(bool enabled) OVERRIDE;
 
   // content::NotificationObserver implementation
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
  private:
   // Returns true if the Search key is assigned to Caps Lock.
diff --git a/chrome/browser/chromeos/status/clock_menu_button.h b/chrome/browser/chromeos/status/clock_menu_button.h
index 2175a87..4eeb59d 100644
--- a/chrome/browser/chromeos/status/clock_menu_button.h
+++ b/chrome/browser/chromeos/status/clock_menu_button.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_STATUS_CLOCK_MENU_BUTTON_H_
 #pragma once
 
+#include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer.h"
 #include "chrome/browser/chromeos/status/status_area_button.h"
@@ -49,14 +50,14 @@ class ClockMenuButton : public StatusAreaButton,
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
  protected:
-  virtual int horizontal_padding();
+  virtual int horizontal_padding() OVERRIDE;
 
  private:
   // views::ViewMenuDelegate implementation.
-  virtual void RunMenu(views::View* source, const gfx::Point& pt);
+  virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE;
 
   // Create and initialize menu if not already present.
   void EnsureMenu();
diff --git a/chrome/browser/chromeos/status/input_method_menu.h b/chrome/browser/chromeos/status/input_method_menu.h
index 29657e2..afcc6b1 100644
--- a/chrome/browser/chromeos/status/input_method_menu.h
+++ b/chrome/browser/chromeos/status/input_method_menu.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
 #include "chrome/browser/prefs/pref_member.h"
@@ -50,53 +51,55 @@ class InputMethodMenu
   virtual ~InputMethodMenu();
 
   // ui::MenuModel implementation.
-  virtual bool HasIcons() const;
-  virtual int GetItemCount() const;
-  virtual ui::MenuModel::ItemType GetTypeAt(int index) const;
-  virtual int GetCommandIdAt(int index) const;
-  virtual string16 GetLabelAt(int index) const;
-  virtual bool IsItemDynamicAt(int index) const;
+  virtual bool HasIcons() const OVERRIDE;
+  virtual int GetItemCount() const OVERRIDE;
+  virtual ui::MenuModel::ItemType GetTypeAt(int index) const OVERRIDE;
+  virtual int GetCommandIdAt(int index) const OVERRIDE;
+  virtual string16 GetLabelAt(int index) const OVERRIDE;
+  virtual bool IsItemDynamicAt(int index) const OVERRIDE;
   virtual bool GetAcceleratorAt(int index,
-                                ui::Accelerator* accelerator) const;
-  virtual bool IsItemCheckedAt(int index) const;
-  virtual int GetGroupIdAt(int index) const;
-  virtual bool GetIconAt(int index, SkBitmap* icon);
-  virtual ui::ButtonMenuItemModel* GetButtonMenuItemAt(int index) const;
-  virtual bool IsEnabledAt(int index) const;
-  virtual ui::MenuModel* GetSubmenuModelAt(int index) const;
-  virtual void HighlightChangedTo(int index);
-  virtual void ActivatedAt(int index);
-  virtual void MenuWillShow();
-  virtual void SetMenuModelDelegate(ui::MenuModelDelegate* delegate);
+                                ui::Accelerator* accelerator) const OVERRIDE;
+  virtual bool IsItemCheckedAt(int index) const OVERRIDE;
+  virtual int GetGroupIdAt(int index) const OVERRIDE;
+  virtual bool GetIconAt(int index, SkBitmap* icon) OVERRIDE;
+  virtual ui::ButtonMenuItemModel* GetButtonMenuItemAt(
+      int index) const OVERRIDE;
+  virtual bool IsEnabledAt(int index) const OVERRIDE;
+  virtual ui::MenuModel* GetSubmenuModelAt(int index) const OVERRIDE;
+  virtual void HighlightChangedTo(int index) OVERRIDE;
+  virtual void ActivatedAt(int index) OVERRIDE;
+  virtual void MenuWillShow() OVERRIDE;
+  virtual void SetMenuModelDelegate(ui::MenuModelDelegate* delegate) OVERRIDE;
 
   // views::ViewMenuDelegate implementation. Sub classes can override the method
   // to adjust the position of the menu.
-  virtual void RunMenu(views::View* source, const gfx::Point& pt);
+  virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE;
 
   // InputMethodManager::Observer implementation.
   virtual void InputMethodChanged(
       input_method::InputMethodManager* manager,
       const input_method::InputMethodDescriptor& current_input_method,
-      size_t num_active_input_methods);
+      size_t num_active_input_methods) OVERRIDE;
   virtual void ActiveInputMethodsChanged(
       input_method::InputMethodManager* manager,
       const input_method::InputMethodDescriptor& current_input_method,
-      size_t num_active_input_methods);
+      size_t num_active_input_methods) OVERRIDE;
   virtual void PropertyListChanged(
       input_method::InputMethodManager* manager,
-      const input_method::ImePropertyList& current_ime_properties);
+      const input_method::ImePropertyList& current_ime_properties) OVERRIDE;
 
   // InputMethodManager::PreferenceObserver implementation.
   virtual void PreferenceUpdateNeeded(
-    input_method::InputMethodManager* manager,
-    const input_method::InputMethodDescriptor& previous_input_method,
-    const input_method::InputMethodDescriptor& current_input_method);
-  virtual void FirstObserverIsAdded(input_method::InputMethodManager* manager);
+      input_method::InputMethodManager* manager,
+      const input_method::InputMethodDescriptor& previous_input_method,
+      const input_method::InputMethodDescriptor& current_input_method) OVERRIDE;
+  virtual void FirstObserverIsAdded(
+      input_method::InputMethodManager* manager) OVERRIDE;
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // Specify menu alignment (default TOPRIGHT).
   void set_menu_alignment(views::MenuItemView::AnchorPosition menu_alignment) {
diff --git a/chrome/browser/chromeos/status/input_method_menu_button.h b/chrome/browser/chromeos/status/input_method_menu_button.h
index 1f98e14..6867d44 100644
--- a/chrome/browser/chromeos/status/input_method_menu_button.h
+++ b/chrome/browser/chromeos/status/input_method_menu_button.h
@@ -27,10 +27,11 @@ class InputMethodMenuButton : public StatusAreaButton,
   virtual ~InputMethodMenuButton();
 
   // views::View implementation.
-  virtual void OnLocaleChanged();
+  virtual void OnLocaleChanged() OVERRIDE;
 
   // views::ViewMenuDelegate implementation.
-  virtual void RunMenu(views::View* unused_source, const gfx::Point& pt);
+  virtual void RunMenu(views::View* unused_source,
+                       const gfx::Point& pt) OVERRIDE;
 
   // InputMethodMenu implementation.
   virtual void UpdateUI(const std::string& input_method_id,
diff --git a/chrome/browser/chromeos/status/power_menu_button.h b/chrome/browser/chromeos/status/power_menu_button.h
index 338aaef..427aaeb 100644
--- a/chrome/browser/chromeos/status/power_menu_button.h
+++ b/chrome/browser/chromeos/status/power_menu_button.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_STATUS_POWER_MENU_BUTTON_H_
 #pragma once
 
+#include "base/compiler_specific.h"
 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
 #include "chrome/browser/chromeos/status/status_area_button.h"
 #include "views/controls/menu/menu_delegate.h"
@@ -34,21 +35,21 @@ class PowerMenuButton : public StatusAreaButton,
   virtual ~PowerMenuButton();
 
   // views::MenuDelegate implementation.
-  virtual string16 GetLabel(int id) const;
+  virtual string16 GetLabel(int id) const OVERRIDE;
 
   // PowerLibrary::Observer implementation.
-  virtual void PowerChanged(const PowerSupplyStatus& power_status);
+  virtual void PowerChanged(const PowerSupplyStatus& power_status) OVERRIDE;
   virtual void SystemResumed() {}
 
  protected:
-  virtual int icon_width();
+  virtual int icon_width() OVERRIDE;
 
  private:
   // views::View
   virtual void OnLocaleChanged() OVERRIDE;
 
   // views::ViewMenuDelegate implementation.
-  virtual void RunMenu(views::View* source, const gfx::Point& pt);
+  virtual void RunMenu(views::View* source, const gfx::Point& pt) OVERRIDE;
 
   // Format strings with power status
   string16 GetBatteryIsChargedText() const;
diff --git a/chrome/browser/chromeos/status/status_area_button.h b/chrome/browser/chromeos/status/status_area_button.h
index 57661f0..98e01ce 100644
--- a/chrome/browser/chromeos/status/status_area_button.h
+++ b/chrome/browser/chromeos/status/status_area_button.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_STATUS_STATUS_AREA_BUTTON_H_
 #pragma once
 
+#include "base/compiler_specific.h"
 #include "base/string16.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/menu/view_menu_delegate.h"
@@ -57,11 +58,11 @@ class StatusAreaButton : public views::MenuButton {
   StatusAreaButton(Delegate* button_delegate,
                    views::ViewMenuDelegate* menu_delegate);
   virtual ~StatusAreaButton() {}
-  virtual void PaintButton(gfx::Canvas* canvas, PaintButtonMode mode);
+  virtual void PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) OVERRIDE;
 
   // Overrides TextButton's SetText to clear max text size before seting new
   // text content so that the button size would fit the new text size.
-  virtual void SetText(const string16& text);
+  virtual void SetText(const string16& text) OVERRIDE;
 
   // views::MenuButton overrides.
   virtual bool Activate() OVERRIDE;
diff --git a/chrome/browser/chromeos/tab_closeable_state_watcher.h b/chrome/browser/chromeos/tab_closeable_state_watcher.h
index 47ec5a2..9b17439 100644
--- a/chrome/browser/chromeos/tab_closeable_state_watcher.h
+++ b/chrome/browser/chromeos/tab_closeable_state_watcher.h
@@ -8,6 +8,7 @@
 
 #include <vector>
 
+#include "base/compiler_specific.h"
 #include "chrome/browser/tab_closeable_state_watcher.h"
 #include "chrome/browser/tabs/tab_strip_model_observer.h"
 #include "chrome/browser/ui/browser_list.h"
@@ -47,11 +48,11 @@ class TabCloseableStateWatcher : public ::TabCloseableStateWatcher,
   virtual ~TabCloseableStateWatcher();
 
   // TabCloseableStateWatcher implementation:
-  virtual bool CanCloseTab(const Browser* browser) const;
+  virtual bool CanCloseTab(const Browser* browser) const OVERRIDE;
   virtual bool CanCloseTabs(const Browser* browser,
-                            std::vector<int>* indices) const;
-  virtual bool CanCloseBrowser(Browser* browser);
-  virtual void OnWindowCloseCanceled(Browser* browser);
+                            std::vector<int>* indices) const OVERRIDE;
+  virtual bool CanCloseBrowser(Browser* browser) OVERRIDE;
+  virtual void OnWindowCloseCanceled(Browser* browser) OVERRIDE;
 
  private:
   enum BrowserActionType {
@@ -61,12 +62,12 @@ class TabCloseableStateWatcher : public ::TabCloseableStateWatcher,
   };
 
   // BrowserList::Observer implementation:
-  virtual void OnBrowserAdded(const Browser* browser);
-  virtual void OnBrowserRemoved(const Browser* browser);
+  virtual void OnBrowserAdded(const Browser* browser) OVERRIDE;
+  virtual void OnBrowserRemoved(const Browser* browser) OVERRIDE;
 
   // NotificationObserver implementation:
   virtual void Observe(int type, const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // Called by private class TabStripWatcher for TabStripModelObserver
   // notifications.
@@ -122,13 +123,14 @@ class TabCloseableStateWatcher : public ::TabCloseableStateWatcher,
 
     // TabStripModelObserver implementation:
     virtual void TabInsertedAt(TabContentsWrapper* contents, int index,
-                               bool foreground);
+                               bool foreground) 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 TabChangedAt(TabContentsWrapper* contents, int index,
-                              TabChangeType change_type);
+                              TabChangeType change_type) OVERRIDE;
 
     const Browser* browser() const {
       return browser_;
diff --git a/chrome/browser/chromeos/upgrade_detector_chromeos.h b/chrome/browser/chromeos/upgrade_detector_chromeos.h
index 89a0fa8..7e80537 100644
--- a/chrome/browser/chromeos/upgrade_detector_chromeos.h
+++ b/chrome/browser/chromeos/upgrade_detector_chromeos.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_CHROMEOS_UPGRADE_DETECTOR_CHROMEOS_H_
 #pragma once
 
+#include "base/compiler_specific.h"
 #include "base/timer.h"
 #include "chrome/browser/chromeos/dbus/update_engine_client.h"
 #include "chrome/browser/upgrade_detector.h"
diff --git a/chrome/browser/chromeos/views/copy_background.h b/chrome/browser/chromeos/views/copy_background.h
index af4b018..6f69735 100644
--- a/chrome/browser/chromeos/views/copy_background.h
+++ b/chrome/browser/chromeos/views/copy_background.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_CHROMEOS_VIEWS_COPY_BACKGROUND_H_
 #pragma once
 
+#include "base/compiler_specific.h"
 #include "views/background.h"
 
 namespace views {
@@ -22,7 +23,7 @@ class CopyBackground : public views::Background {
   virtual ~CopyBackground() {}
 
   // Overridden from views::Background.
-  virtual void Paint(gfx::Canvas* canvas, views::View* view) const;
+  virtual void Paint(gfx::Canvas* canvas, views::View* view) const OVERRIDE;
 
  private:
   views::View* background_owner_;
diff --git a/chrome/browser/chromeos/views/dropdown_button.h b/chrome/browser/chromeos/views/dropdown_button.h
index ab33add..eeac578 100644
--- a/chrome/browser/chromeos/views/dropdown_button.h
+++ b/chrome/browser/chromeos/views/dropdown_button.h
@@ -8,6 +8,7 @@
 
 #include <string>
 
+#include "base/compiler_specific.h"
 #include "views/controls/button/menu_button.h"
 
 namespace chromeos {
@@ -22,12 +23,12 @@ class DropDownButton : public views::MenuButton {
                  bool show_menu_marker);
   virtual ~DropDownButton();
 
-  virtual void OnPaintFocusBorder(gfx::Canvas* canvas);
+  virtual void OnPaintFocusBorder(gfx::Canvas* canvas) OVERRIDE;
 
   // Override SetText to set the accessible value, rather than the
   // accessible name, since this acts more like a combo box than a
   // menu.
-  virtual void SetText(const string16& text);
+  virtual void SetText(const string16& text) OVERRIDE;
 
   virtual string16 GetAccessibleValue();