Add OVERRIDE to chrome/browser/.

BUG=104314
TEST=no change

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

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

88 files changed, 423 insertions, 373 deletions

diff --git a/chrome/browser/accessibility_events.h b/chrome/browser/accessibility_events.h
index 88550e2..0b94f28 100644
--- a/chrome/browser/accessibility_events.h
+++ b/chrome/browser/accessibility_events.h
@@ -72,7 +72,7 @@ class AccessibilityWindowInfo : public AccessibilityControlInfo {
  public:
   AccessibilityWindowInfo(Profile* profile, const std::string& window_name);
 
-  virtual const char* type() const;
+  virtual const char* type() const OVERRIDE;
 };
 
 // Accessibility information about a push button passed to onControlFocused
@@ -81,7 +81,7 @@ class AccessibilityButtonInfo : public AccessibilityControlInfo {
  public:
   AccessibilityButtonInfo(Profile* profile, const std::string& button_name);
 
-  virtual const char* type() const;
+  virtual const char* type() const OVERRIDE;
 };
 
 // Accessibility information about a hyperlink passed to onControlFocused
@@ -90,7 +90,7 @@ class AccessibilityLinkInfo : public AccessibilityControlInfo {
  public:
   AccessibilityLinkInfo(Profile* profile, const std::string& link_name);
 
-  virtual const char* type() const;
+  virtual const char* type() const OVERRIDE;
 };
 
 // Accessibility information about a radio button passed to onControlFocused
@@ -103,9 +103,9 @@ class AccessibilityRadioButtonInfo : public AccessibilityControlInfo {
                                int item_index,
                                int item_count);
 
-  virtual const char* type() const;
+  virtual const char* type() const OVERRIDE;
 
-  virtual void SerializeToDict(base::DictionaryValue* dict) const;
+  virtual void SerializeToDict(base::DictionaryValue* dict) const OVERRIDE;
 
   void SetChecked(bool checked) { checked_ = checked; }
 
@@ -128,9 +128,9 @@ class AccessibilityCheckboxInfo : public AccessibilityControlInfo {
                             const std::string& name,
                             bool checked);
 
-  virtual const char* type() const;
+  virtual const char* type() const OVERRIDE;
 
-  virtual void SerializeToDict(base::DictionaryValue* dict) const;
+  virtual void SerializeToDict(base::DictionaryValue* dict) const OVERRIDE;
 
   void SetChecked(bool checked) { checked_ = checked; }
 
@@ -149,9 +149,9 @@ class AccessibilityTabInfo : public AccessibilityControlInfo {
                        int tab_index,
                        int tab_count);
 
-  virtual const char* type() const;
+  virtual const char* type() const OVERRIDE;
 
-  virtual void SerializeToDict(base::DictionaryValue* dict) const;
+  virtual void SerializeToDict(base::DictionaryValue* dict) const OVERRIDE;
 
   void SetTab(int tab_index, std::string tab_name) {
     tab_index_ = tab_index;
@@ -177,9 +177,9 @@ class AccessibilityComboBoxInfo : public AccessibilityControlInfo {
                             int item_index,
                             int item_count);
 
-  virtual const char* type() const;
+  virtual const char* type() const OVERRIDE;
 
-  virtual void SerializeToDict(base::DictionaryValue* dict) const;
+  virtual void SerializeToDict(base::DictionaryValue* dict) const OVERRIDE;
 
   void SetValue(int item_index, const std::string& value) {
     item_index_ = item_index;
@@ -207,9 +207,9 @@ class AccessibilityTextBoxInfo : public AccessibilityControlInfo {
                            const std::string& name,
                            bool password);
 
-  virtual const char* type() const;
+  virtual const char* type() const OVERRIDE;
 
-  virtual void SerializeToDict(base::DictionaryValue* dict) const;
+  virtual void SerializeToDict(base::DictionaryValue* dict) const OVERRIDE;
 
   void SetValue(
       const std::string& value, int selection_start, int selection_end) {
@@ -240,9 +240,9 @@ class AccessibilityListBoxInfo : public AccessibilityControlInfo {
                            int item_index,
                            int item_count);
 
-  virtual const char* type() const;
+  virtual const char* type() const OVERRIDE;
 
-  virtual void SerializeToDict(base::DictionaryValue* dict) const;
+  virtual void SerializeToDict(base::DictionaryValue* dict) const OVERRIDE;
 
   void SetValue(int item_index, std::string value) {
     item_index_ = item_index;
@@ -268,7 +268,7 @@ class AccessibilityMenuInfo : public AccessibilityControlInfo {
  public:
   AccessibilityMenuInfo(Profile* profile, const std::string& menu_name);
 
-  virtual const char* type() const;
+  virtual const char* type() const OVERRIDE;
 };
 
 // Accessibility information about a volume; this class is used by
@@ -278,7 +278,7 @@ class AccessibilityVolumeInfo : public AccessibilityEventInfo {
   // |volume| must range between 0 to 100.
   AccessibilityVolumeInfo(Profile* profile, double volume, bool is_muted);
 
-  virtual void SerializeToDict(base::DictionaryValue* dict) const;
+  virtual void SerializeToDict(base::DictionaryValue* dict) const OVERRIDE;
 
  private:
   double volume_;
@@ -295,9 +295,9 @@ class AccessibilityMenuItemInfo : public AccessibilityControlInfo {
                             int item_index,
                             int item_count);
 
-  virtual const char* type() const;
+  virtual const char* type() const OVERRIDE;
 
-  virtual void SerializeToDict(base::DictionaryValue* dict) const;
+  virtual void SerializeToDict(base::DictionaryValue* dict) const OVERRIDE;
 
   int item_index() const { return item_index_; }
   int item_count() const { return item_count_; }
diff --git a/chrome/browser/autocomplete/autocomplete_edit.h b/chrome/browser/autocomplete/autocomplete_edit.h
index f33e509..6dd75fd 100644
--- a/chrome/browser/autocomplete/autocomplete_edit.h
+++ b/chrome/browser/autocomplete/autocomplete_edit.h
@@ -363,7 +363,7 @@ class AutocompleteEditModel : public AutocompleteControllerDelegate {
   };
 
   // AutocompleteControllerDelegate:
-  virtual void OnResultChanged(bool default_match_changed);
+  virtual void OnResultChanged(bool default_match_changed) OVERRIDE;
 
   // Returns true if a query to an autocomplete provider is currently
   // in progress.  This logic should in the future live in
diff --git a/chrome/browser/autocomplete/builtin_provider.h b/chrome/browser/autocomplete/builtin_provider.h
index 8e9bde3..858c92d 100644
--- a/chrome/browser/autocomplete/builtin_provider.h
+++ b/chrome/browser/autocomplete/builtin_provider.h
@@ -25,7 +25,8 @@ class BuiltinProvider : public AutocompleteProvider {
   virtual ~BuiltinProvider();
 
   // AutocompleteProvider:
-  virtual void Start(const AutocompleteInput& input, bool minimal_changes);
+  virtual void Start(const AutocompleteInput& input,
+                     bool minimal_changes) OVERRIDE;
 
  private:
   typedef std::vector<string16> Builtins;
diff --git a/chrome/browser/autocomplete/keyword_provider.h b/chrome/browser/autocomplete/keyword_provider.h
index 8f422ad..3867345 100644
--- a/chrome/browser/autocomplete/keyword_provider.h
+++ b/chrome/browser/autocomplete/keyword_provider.h
@@ -72,8 +72,9 @@ class KeywordProvider : public AutocompleteProvider,
       string16* remaining_input);
 
   // AutocompleteProvider
-  virtual void Start(const AutocompleteInput& input, bool minimal_changes);
-  virtual void Stop();
+  virtual void Start(const AutocompleteInput& input,
+                     bool minimal_changes) OVERRIDE;
+  virtual void Stop() OVERRIDE;
 
  private:
   class ScopedEndExtensionKeywordMode;
@@ -136,7 +137,7 @@ class KeywordProvider : public AutocompleteProvider,
   // content::NotificationObserver interface.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // Model for the keywords.  This is only non-null when testing, otherwise the
   // TemplateURLService from the Profile is used.
diff --git a/chrome/browser/autocomplete/search_provider.h b/chrome/browser/autocomplete/search_provider.h
index 845ec7b..cf410f5 100644
--- a/chrome/browser/autocomplete/search_provider.h
+++ b/chrome/browser/autocomplete/search_provider.h
@@ -71,7 +71,7 @@ class SearchProvider : public AutocompleteProvider,
   virtual void Stop() OVERRIDE;
 
   // content::URLFetcherDelegate
-  virtual void OnURLFetchComplete(const content::URLFetcher* source);
+  virtual void OnURLFetchComplete(const content::URLFetcher* source) OVERRIDE;
 
   // ID used in creating URLFetcher for default provider's suggest results.
   static const int kDefaultProviderURLFetcherID;
diff --git a/chrome/browser/autocomplete_history_manager.h b/chrome/browser/autocomplete_history_manager.h
index 1df7e8f..3f99424 100644
--- a/chrome/browser/autocomplete_history_manager.h
+++ b/chrome/browser/autocomplete_history_manager.h
@@ -30,11 +30,12 @@ class AutocompleteHistoryManager : public TabContentsObserver,
   virtual ~AutocompleteHistoryManager();
 
   // TabContentsObserver implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // WebDataServiceConsumer implementation.
-  virtual void OnWebDataServiceRequestDone(WebDataService::Handle h,
-                                           const WDTypedResult* result);
+  virtual void OnWebDataServiceRequestDone(
+      WebDataService::Handle h,
+      const WDTypedResult* result) OVERRIDE;
 
   // Pass-through functions that are called by AutofillManager, after it has
   // dispatched a message.
diff --git a/chrome/browser/autofill/autofill_xml_parser.h b/chrome/browser/autofill/autofill_xml_parser.h
index f25e31a..eceba5c 100644
--- a/chrome/browser/autofill/autofill_xml_parser.h
+++ b/chrome/browser/autofill/autofill_xml_parser.h
@@ -28,20 +28,23 @@ class AutofillXmlParser : public buzz::XmlParseHandler {
   // A callback for the end of an </element>, called by Expat.
   // |context| is a parsing context used to resolve element/attribute names.
   // |name| is the name of the element.
-  virtual void EndElement(buzz::XmlParseContext* context, const char* name);
+  virtual void EndElement(buzz::XmlParseContext* context,
+                          const char* name) OVERRIDE;
 
   // The callback for character data between tags (<element>text...</element>).
   // |context| is a parsing context used to resolve element/attribute names.
   // |text| is a pointer to the beginning of character data (not null
   // terminated).
   // |len| is the length of the string pointed to by text.
-  virtual void CharacterData(buzz::XmlParseContext* context, const char* text,
-                             int len);
+  virtual void CharacterData(buzz::XmlParseContext* context,
+                             const char* text,
+                             int len) OVERRIDE;
 
   // The callback for parsing errors.
   // |context| is a parsing context used to resolve names.
   // |error_code| is a code representing the parsing error.
-  virtual void Error(buzz::XmlParseContext* context, XML_Error error_code);
+  virtual void Error(buzz::XmlParseContext* context,
+                     XML_Error error_code) OVERRIDE;
 
   // True if parsing succeeded.
   bool succeeded_;
@@ -73,8 +76,9 @@ class AutofillQueryXmlParser : public AutofillXmlParser {
   // |context| is a parsing context used to resolve element/attribute names.
   // |name| is the name of the element.
   // |attrs| is the list of attributes (names and values) for the element.
-  virtual void StartElement(buzz::XmlParseContext* context, const char* name,
-                            const char** attrs);
+  virtual void StartElement(buzz::XmlParseContext* context,
+                            const char* name,
+                            const char** attrs) OVERRIDE;
 
   // A helper function to retrieve integer values from strings.  Raises an
   // XML parse error if it fails.
@@ -117,8 +121,9 @@ class AutofillUploadXmlParser : public AutofillXmlParser {
   // |context| is a parsing context used to resolve element/attribute names.
   // |name| is the name of the element.
   // |attrs| is the list of attributes (names and values) for the element.
-  virtual void StartElement(buzz::XmlParseContext* context, const char* name,
-                            const char** attrs);
+  virtual void StartElement(buzz::XmlParseContext* context,
+                            const char* name,
+                            const char** attrs) OVERRIDE;
 
   // A helper function to retrieve double values from strings.  Raises an XML
   // parse error if it fails.
diff --git a/chrome/browser/background/background_application_list_model.h b/chrome/browser/background/background_application_list_model.h
index 333d850..44248c8 100644
--- a/chrome/browser/background/background_application_list_model.h
+++ b/chrome/browser/background/background_application_list_model.h
@@ -105,7 +105,7 @@ class BackgroundApplicationListModel : public content::NotificationObserver {
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // Notifies observers that some of the data associated with this background
   // application, e. g. the Icon, has changed.
diff --git a/chrome/browser/background/background_contents_service.h b/chrome/browser/background/background_contents_service.h
index 7143418..14adadc 100644
--- a/chrome/browser/background/background_contents_service.h
+++ b/chrome/browser/background/background_contents_service.h
@@ -62,7 +62,7 @@ class BackgroundContentsService : private content::NotificationObserver,
   virtual void AddTabContents(TabContents* new_contents,
                               WindowOpenDisposition disposition,
                               const gfx::Rect& initial_pos,
-                              bool user_gesture);
+                              bool user_gesture) OVERRIDE;
 
   // Gets the parent application id for the passed BackgroundContents. Returns
   // an empty string if no parent application found (e.g. passed
@@ -108,7 +108,7 @@ class BackgroundContentsService : private content::NotificationObserver,
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // Loads all registered BackgroundContents at startup.
   void LoadBackgroundContentsFromPrefs(Profile* profile);
diff --git a/chrome/browser/background/background_contents_service_factory.h b/chrome/browser/background/background_contents_service_factory.h
index 9e3e289..3a03c36 100644
--- a/chrome/browser/background/background_contents_service_factory.h
+++ b/chrome/browser/background/background_contents_service_factory.h
@@ -30,7 +30,7 @@ class BackgroundContentsServiceFactory : public ProfileKeyedServiceFactory {
   // ProfileKeyedServiceFactory:
   virtual ProfileKeyedService* BuildServiceInstanceFor(
       Profile* profile) const OVERRIDE;
-  virtual void RegisterUserPrefs(PrefService* user_prefs);
+  virtual void RegisterUserPrefs(PrefService* user_prefs) OVERRIDE;
   // Use a separate background contents service for incognito.
   virtual bool ServiceHasOwnInstanceInIncognito() OVERRIDE;
   virtual bool ServiceIsCreatedWithProfile() OVERRIDE;
diff --git a/chrome/browser/bookmarks/bookmark_extension_api.h b/chrome/browser/bookmarks/bookmark_extension_api.h
index 9133352f..d1bc3ae 100644
--- a/chrome/browser/bookmarks/bookmark_extension_api.h
+++ b/chrome/browser/bookmarks/bookmark_extension_api.h
@@ -192,7 +192,7 @@ class UpdateBookmarkFunction : public BookmarksFunction {
                          bool* invalid_id);
   virtual void GetQuotaLimitHeuristics(
       QuotaLimitHeuristics* heuristics) const OVERRIDE;
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
  private:
   DECLARE_EXTENSION_FUNCTION_NAME("bookmarks.update")
 };
diff --git a/chrome/browser/bookmarks/bookmark_html_writer.h b/chrome/browser/bookmarks/bookmark_html_writer.h
index fc66d3c..6342281 100644
--- a/chrome/browser/bookmarks/bookmark_html_writer.h
+++ b/chrome/browser/bookmarks/bookmark_html_writer.h
@@ -48,7 +48,7 @@ class BookmarkFaviconFetcher: 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:
   // Recursively extracts URLs from bookmarks.
diff --git a/chrome/browser/bookmarks/bookmark_manager_extension_api.h b/chrome/browser/bookmarks/bookmark_manager_extension_api.h
index e363abe..8827806 100644
--- a/chrome/browser/bookmarks/bookmark_manager_extension_api.h
+++ b/chrome/browser/bookmarks/bookmark_manager_extension_api.h
@@ -28,10 +28,10 @@ class BookmarkManagerExtensionEventRouter
   virtual ~BookmarkManagerExtensionEventRouter();
 
   // RenderViewHostDelegate::BookmarkDrag interface
-  virtual void OnDragEnter(const BookmarkNodeData& data);
-  virtual void OnDragOver(const BookmarkNodeData& data);
-  virtual void OnDragLeave(const BookmarkNodeData& data);
-  virtual void OnDrop(const BookmarkNodeData& data);
+  virtual void OnDragEnter(const BookmarkNodeData& data) OVERRIDE;
+  virtual void OnDragOver(const BookmarkNodeData& data) OVERRIDE;
+  virtual void OnDragLeave(const BookmarkNodeData& data) OVERRIDE;
+  virtual void OnDrop(const BookmarkNodeData& data) OVERRIDE;
 
   // The bookmark drag and drop data. This gets set after a drop was done on
   // the page. This returns NULL if no data is available.
diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h
index eb84286..6108e0b 100644
--- a/chrome/browser/bookmarks/bookmark_model.h
+++ b/chrome/browser/bookmarks/bookmark_model.h
@@ -171,7 +171,7 @@ class BookmarkPermanentNode : public BookmarkNode {
   BookmarkPermanentNode(int64 id, const GURL& url, Profile* profile);
 
   virtual ~BookmarkPermanentNode();
-  virtual bool IsVisible() const;
+  virtual bool IsVisible() const OVERRIDE;
 
  private:
   Profile* profile_;
diff --git a/chrome/browser/bookmarks/bookmark_storage.h b/chrome/browser/bookmarks/bookmark_storage.h
index 135f0d4..fb61e4a 100644
--- a/chrome/browser/bookmarks/bookmark_storage.h
+++ b/chrome/browser/bookmarks/bookmark_storage.h
@@ -108,7 +108,7 @@ class BookmarkStorage : public content::NotificationObserver,
   void BookmarkModelDeleted();
 
   // ImportantFileWriter::DataSerializer
-  virtual bool SerializeData(std::string* output);
+  virtual bool SerializeData(std::string* output) OVERRIDE;
 
  private:
   friend class base::RefCountedThreadSafe<BookmarkStorage>;
@@ -140,7 +140,7 @@ class BookmarkStorage : public content::NotificationObserver,
   // content::NotificationObserver
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // Serializes the data and schedules save using ImportantFileWriter.
   // Returns true on successful serialization.
diff --git a/chrome/browser/bookmarks/recently_used_folders_combo_model.h b/chrome/browser/bookmarks/recently_used_folders_combo_model.h
index b405899..9411865 100644
--- a/chrome/browser/bookmarks/recently_used_folders_combo_model.h
+++ b/chrome/browser/bookmarks/recently_used_folders_combo_model.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.
 
@@ -21,8 +21,8 @@ class RecentlyUsedFoldersComboModel : public ui::ComboboxModel {
   virtual ~RecentlyUsedFoldersComboModel();
 
   // Overridden from ui::ComboboxModel:
-  virtual int GetItemCount();
-  virtual string16 GetItemAt(int index);
+  virtual int GetItemCount() OVERRIDE;
+  virtual string16 GetItemAt(int index) OVERRIDE;
 
   // Returns the node at the specified |index|.
   const BookmarkNode* GetNodeAt(int index);
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index a464494..e3b9d994 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -117,7 +117,7 @@ class BrowserProcessImpl : public BrowserProcess,
   virtual MHTMLGenerationManager* mhtml_generation_manager() OVERRIDE;
   virtual GpuBlacklistUpdater* gpu_blacklist_updater() OVERRIDE;
   virtual ComponentUpdateService* component_updater() OVERRIDE;
-  virtual CRLSetFetcher* crl_set_fetcher();
+  virtual CRLSetFetcher* crl_set_fetcher() OVERRIDE;
 
  private:
   void CreateResourceDispatcherHost();
diff --git a/chrome/browser/browsing_data_cookie_helper.h b/chrome/browser/browsing_data_cookie_helper.h
index 6f93054..5597619 100644
--- a/chrome/browser/browsing_data_cookie_helper.h
+++ b/chrome/browser/browsing_data_cookie_helper.h
@@ -112,8 +112,8 @@ class CannedBrowsingDataCookieHelper : public BrowsingDataCookieHelper {
 
   // BrowsingDataCookieHelper methods.
   virtual void StartFetching(
-      const net::CookieMonster::GetCookieListCallback& callback);
-  virtual void CancelNotification();
+      const net::CookieMonster::GetCookieListCallback& callback) OVERRIDE;
+  virtual void CancelNotification() OVERRIDE;
 
  private:
   // Check if the cookie list contains a cookie with the same name,
diff --git a/chrome/browser/browsing_data_remover.h b/chrome/browser/browsing_data_remover.h
index bf7533b..385ecaa 100644
--- a/chrome/browser/browsing_data_remover.h
+++ b/chrome/browser/browsing_data_remover.h
@@ -134,11 +134,12 @@ class BrowsingDataRemover : public content::NotificationObserver,
   // BrowsingDataRemover.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // WaitableEventWatcher implementation.
   // Called when plug-in data has been cleared. Invokes NotifyAndDeleteIfDone.
-  virtual void OnWaitableEventSignaled(base::WaitableEvent* waitable_event);
+  virtual void OnWaitableEventSignaled(
+      base::WaitableEvent* waitable_event) OVERRIDE;
 
   // If we're not waiting on anything, notifies observers and deletes this
   // object.
diff --git a/chrome/browser/chrome_benchmarking_message_filter.h b/chrome/browser/chrome_benchmarking_message_filter.h
index e8eee90..98e8549 100644
--- a/chrome/browser/chrome_benchmarking_message_filter.h
+++ b/chrome/browser/chrome_benchmarking_message_filter.h
@@ -26,7 +26,7 @@ class ChromeBenchmarkingMessageFilter : public BrowserMessageFilter {
 
   // BrowserMessageFilter methods:
   virtual bool OnMessageReceived(const IPC::Message& message,
-                                 bool* message_was_ok);
+                                 bool* message_was_ok) OVERRIDE;
 
  private:
   virtual ~ChromeBenchmarkingMessageFilter();
diff --git a/chrome/browser/chrome_plugin_message_filter.h b/chrome/browser/chrome_plugin_message_filter.h
index 2f02452..08bc147 100644
--- a/chrome/browser/chrome_plugin_message_filter.h
+++ b/chrome/browser/chrome_plugin_message_filter.h
@@ -23,10 +23,10 @@ class ChromePluginMessageFilter : public IPC::ChannelProxy::MessageFilter,
   explicit ChromePluginMessageFilter(PluginProcessHost* process);
 
   // BrowserMessageFilter methods:
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
   // IPC::Message::Sender methods:
-  virtual bool Send(IPC::Message* message);
+  virtual bool Send(IPC::Message* message) OVERRIDE;
 
  private:
   virtual ~ChromePluginMessageFilter();
diff --git a/chrome/browser/chrome_plugin_service_filter.h b/chrome/browser/chrome_plugin_service_filter.h
index d3486ce..73b8b0a 100644
--- a/chrome/browser/chrome_plugin_service_filter.h
+++ b/chrome/browser/chrome_plugin_service_filter.h
@@ -75,7 +75,7 @@ class ChromePluginServiceFilter : public content::PluginServiceFilter,
   // content::NotificationObserver implementation:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   content::NotificationRegistrar registrar_;
 
diff --git a/chrome/browser/content_settings/host_content_settings_map.h b/chrome/browser/content_settings/host_content_settings_map.h
index 5eb4ae7..8d538b2 100644
--- a/chrome/browser/content_settings/host_content_settings_map.h
+++ b/chrome/browser/content_settings/host_content_settings_map.h
@@ -168,7 +168,7 @@ class HostContentSettingsMap
       ContentSettingsPattern primary_pattern,
       ContentSettingsPattern secondary_pattern,
       ContentSettingsType content_type,
-      std::string resource_identifier);
+      std::string resource_identifier) OVERRIDE;
 
   // Returns true if we should allow all content types for this URL.  This is
   // true for various internal objects like chrome:// URLs, so UI and other
diff --git a/chrome/browser/cookies_tree_model.h b/chrome/browser/cookies_tree_model.h
index 694139b..011e318 100644
--- a/chrome/browser/cookies_tree_model.h
+++ b/chrome/browser/cookies_tree_model.h
@@ -194,8 +194,8 @@ class CookieTreeRootNode : public CookieTreeNode {
   CookieTreeOriginNode* GetOrCreateOriginNode(const GURL& url);
 
   // CookieTreeNode methods:
-  virtual CookiesTreeModel* GetModel() const;
-  virtual DetailedInfo GetDetailedInfo() const;
+  virtual CookiesTreeModel* GetModel() const OVERRIDE;
+  virtual DetailedInfo GetDetailedInfo() const OVERRIDE;
 
  private:
   CookiesTreeModel* model_;
@@ -213,7 +213,7 @@ class CookieTreeOriginNode : public CookieTreeNode {
   virtual ~CookieTreeOriginNode();
 
   // CookieTreeNode methods:
-  virtual DetailedInfo GetDetailedInfo() const;
+  virtual DetailedInfo GetDetailedInfo() const OVERRIDE;
 
   // CookieTreeOriginNode methods:
   CookieTreeCookiesNode* GetOrCreateCookiesNode();
@@ -267,8 +267,8 @@ class CookieTreeCookieNode : public CookieTreeNode {
   virtual ~CookieTreeCookieNode();
 
   // CookieTreeNode methods:
-  virtual void DeleteStoredObjects();
-  virtual DetailedInfo GetDetailedInfo() const;
+  virtual void DeleteStoredObjects() OVERRIDE;
+  virtual DetailedInfo GetDetailedInfo() const OVERRIDE;
 
  private:
   // cookie_ is expected to remain valid as long as the CookieTreeCookieNode is
@@ -283,7 +283,7 @@ class CookieTreeCookiesNode : public CookieTreeNode {
   CookieTreeCookiesNode();
   virtual ~CookieTreeCookiesNode();
 
-  virtual DetailedInfo GetDetailedInfo() const;
+  virtual DetailedInfo GetDetailedInfo() const OVERRIDE;
 
   void AddCookieNode(CookieTreeCookieNode* child) {
     AddChildSortedByTitle(child);
@@ -305,8 +305,8 @@ class CookieTreeAppCacheNode : public CookieTreeNode {
       std::list<appcache::AppCacheInfo>::iterator appcache_info);
   virtual ~CookieTreeAppCacheNode();
 
-  virtual void DeleteStoredObjects();
-  virtual DetailedInfo GetDetailedInfo() const;
+  virtual void DeleteStoredObjects() OVERRIDE;
+  virtual DetailedInfo GetDetailedInfo() const OVERRIDE;
 
  private:
   GURL origin_url_;
@@ -319,7 +319,7 @@ class CookieTreeAppCachesNode : public CookieTreeNode {
   CookieTreeAppCachesNode();
   virtual ~CookieTreeAppCachesNode();
 
-  virtual DetailedInfo GetDetailedInfo() const;
+  virtual DetailedInfo GetDetailedInfo() const OVERRIDE;
 
   void AddAppCacheNode(CookieTreeAppCacheNode* child) {
     AddChildSortedByTitle(child);
@@ -341,8 +341,8 @@ class CookieTreeDatabaseNode : public CookieTreeNode {
           database_info);
   virtual ~CookieTreeDatabaseNode();
 
-  virtual void DeleteStoredObjects();
-  virtual DetailedInfo GetDetailedInfo() const;
+  virtual void DeleteStoredObjects() OVERRIDE;
+  virtual DetailedInfo GetDetailedInfo() const OVERRIDE;
 
  private:
   // database_info_ is expected to remain valid as long as the
@@ -358,7 +358,7 @@ class CookieTreeDatabasesNode : public CookieTreeNode {
   CookieTreeDatabasesNode();
   virtual ~CookieTreeDatabasesNode();
 
-  virtual DetailedInfo GetDetailedInfo() const;
+  virtual DetailedInfo GetDetailedInfo() const OVERRIDE;
 
   void AddDatabaseNode(CookieTreeDatabaseNode* child) {
     AddChildSortedByTitle(child);
@@ -380,8 +380,8 @@ class CookieTreeFileSystemNode : public CookieTreeNode {
           file_system_info);
   virtual ~CookieTreeFileSystemNode();
 
-  virtual void DeleteStoredObjects();
-  virtual DetailedInfo GetDetailedInfo() const;
+  virtual void DeleteStoredObjects() OVERRIDE;
+  virtual DetailedInfo GetDetailedInfo() const OVERRIDE;
 
  private:
   // file_system_info_ expected to remain valid as long as the
@@ -397,7 +397,7 @@ class CookieTreeFileSystemsNode : public CookieTreeNode {
   CookieTreeFileSystemsNode();
   virtual ~CookieTreeFileSystemsNode();
 
-  virtual DetailedInfo GetDetailedInfo() const;
+  virtual DetailedInfo GetDetailedInfo() const OVERRIDE;
 
   void AddFileSystemNode(CookieTreeFileSystemNode* child) {
     AddChildSortedByTitle(child);
@@ -418,8 +418,8 @@ class CookieTreeLocalStorageNode : public CookieTreeNode {
   virtual ~CookieTreeLocalStorageNode();
 
   // CookieTreeNode methods:
-  virtual void DeleteStoredObjects();
-  virtual DetailedInfo GetDetailedInfo() const;
+  virtual void DeleteStoredObjects() OVERRIDE;
+  virtual DetailedInfo GetDetailedInfo() const OVERRIDE;
 
  private:
   // local_storage_info_ is expected to remain valid as long as the
@@ -435,7 +435,7 @@ class CookieTreeLocalStoragesNode : public CookieTreeNode {
   CookieTreeLocalStoragesNode();
   virtual ~CookieTreeLocalStoragesNode();
 
-  virtual DetailedInfo GetDetailedInfo() const;
+  virtual DetailedInfo GetDetailedInfo() const OVERRIDE;
 
   void AddLocalStorageNode(CookieTreeLocalStorageNode* child) {
     AddChildSortedByTitle(child);
@@ -458,8 +458,8 @@ class CookieTreeSessionStorageNode : public CookieTreeNode {
   virtual ~CookieTreeSessionStorageNode();
 
   // CookieTreeNode methods:
-  virtual void DeleteStoredObjects();
-  virtual DetailedInfo GetDetailedInfo() const;
+  virtual void DeleteStoredObjects() OVERRIDE;
+  virtual DetailedInfo GetDetailedInfo() const OVERRIDE;
 
  private:
   // session_storage_info_ is expected to remain valid as long as the
@@ -475,7 +475,7 @@ class CookieTreeSessionStoragesNode : public CookieTreeNode {
   CookieTreeSessionStoragesNode();
   virtual ~CookieTreeSessionStoragesNode();
 
-  virtual DetailedInfo GetDetailedInfo() const;
+  virtual DetailedInfo GetDetailedInfo() const OVERRIDE;
 
   void AddSessionStorageNode(CookieTreeSessionStorageNode* child) {
     AddChildSortedByTitle(child);
@@ -497,8 +497,8 @@ class CookieTreeIndexedDBNode : public CookieTreeNode {
   virtual ~CookieTreeIndexedDBNode();
 
   // CookieTreeNode methods:
-  virtual void DeleteStoredObjects();
-  virtual DetailedInfo GetDetailedInfo() const;
+  virtual void DeleteStoredObjects() OVERRIDE;
+  virtual DetailedInfo GetDetailedInfo() const OVERRIDE;
 
  private:
   // indexed_db_info_ is expected to remain valid as long as the
@@ -514,7 +514,7 @@ class CookieTreeIndexedDBsNode : public CookieTreeNode {
   CookieTreeIndexedDBsNode();
   virtual ~CookieTreeIndexedDBsNode();
 
-  virtual DetailedInfo GetDetailedInfo() const;
+  virtual DetailedInfo GetDetailedInfo() const OVERRIDE;
 
   void AddIndexedDBNode(CookieTreeIndexedDBNode* child) {
     AddChildSortedByTitle(child);
@@ -533,8 +533,8 @@ class CookieTreeQuotaNode : public CookieTreeNode {
       std::list<BrowsingDataQuotaHelper::QuotaInfo>::iterator quota_info);
   virtual ~CookieTreeQuotaNode();
 
-  virtual void DeleteStoredObjects();
-  virtual DetailedInfo GetDetailedInfo() const;
+  virtual void DeleteStoredObjects() OVERRIDE;
+  virtual DetailedInfo GetDetailedInfo() const OVERRIDE;
 
  private:
   // quota_info_ is expected to remain valid as long as the CookieTreeQuotaNode
@@ -573,12 +573,12 @@ class CookiesTreeModel : public ui::TreeNodeModel<CookieTreeNode> {
   // ui::TreeModel methods:
   // Returns the set of icons for the nodes in the tree. You only need override
   // this if you don't want to use the default folder icons.
-  virtual void GetIcons(std::vector<SkBitmap>* icons);
+  virtual void GetIcons(std::vector<SkBitmap>* icons) OVERRIDE;
 
   // Returns the index of the icon to use for |node|. Return -1 to use the
   // default icon. The index is relative to the list of icons returned from
   // GetIcons.
-  virtual int GetIconIndex(ui::TreeModelNode* node);
+  virtual int GetIconIndex(ui::TreeModelNode* node) OVERRIDE;
 
   // CookiesTreeModel methods:
   void DeleteAllStoredObjects();
diff --git a/chrome/browser/custom_handlers/protocol_handler_registry.h b/chrome/browser/custom_handlers/protocol_handler_registry.h
index 98d3e02d..03c633b 100644
--- a/chrome/browser/custom_handlers/protocol_handler_registry.h
+++ b/chrome/browser/custom_handlers/protocol_handler_registry.h
@@ -40,7 +40,7 @@ class ProtocolHandlerRegistry
     // Get response from the worker regarding whether Chrome is the default
     // handler for the protocol.
     virtual void SetDefaultWebClientUIState(
-        ShellIntegration::DefaultWebClientUIState state);
+        ShellIntegration::DefaultWebClientUIState state) OVERRIDE;
 
     // Give the observer a handle to the worker, so we can find out the protocol
     // when we're called and also tell the worker if we get deleted.
@@ -50,7 +50,7 @@ class ProtocolHandlerRegistry
     ShellIntegration::DefaultProtocolClientWorker* worker_;
 
    private:
-    virtual bool IsOwnedByWorker() { return true; }
+    virtual bool IsOwnedByWorker() OVERRIDE { return true; }
     // This is a raw pointer, not reference counted, intentionally. In general
     // subclasses of DefaultWebClientObserver are not able to be refcounted
     // e.g. the browser options page
diff --git a/chrome/browser/debugger/browser_list_tabcontents_provider.h b/chrome/browser/debugger/browser_list_tabcontents_provider.h
index f37ee3c..7fdc2d0 100644
--- a/chrome/browser/debugger/browser_list_tabcontents_provider.h
+++ b/chrome/browser/debugger/browser_list_tabcontents_provider.h
@@ -15,9 +15,10 @@ class BrowserListTabContentsProvider
   virtual ~BrowserListTabContentsProvider() {}
 
   // DevToolsHttpProtocolHandler::Delegate overrides.
-  virtual DevToolsHttpProtocolHandler::InspectableTabs GetInspectableTabs();
-  virtual std::string GetDiscoveryPageHTML();
-  virtual net::URLRequestContext* GetURLRequestContext();
+  virtual DevToolsHttpProtocolHandler::InspectableTabs
+      GetInspectableTabs() OVERRIDE;
+  virtual std::string GetDiscoveryPageHTML() OVERRIDE;
+  virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE;
  private:
   DISALLOW_COPY_AND_ASSIGN(BrowserListTabContentsProvider);
 };
diff --git a/chrome/browser/debugger/debugger_remote_service.h b/chrome/browser/debugger/debugger_remote_service.h
index 02d75d3..7635117 100644
--- a/chrome/browser/debugger/debugger_remote_service.h
+++ b/chrome/browser/debugger/debugger_remote_service.h
@@ -68,11 +68,11 @@ class DebuggerRemoteService : public DevToolsRemoteListener {
   // Processes |message| from the remote debugger, where the tool is
   // "V8Debugger". Either sends the reply immediately or waits for an
   // asynchronous response from the V8 debugger.
-  virtual void HandleMessage(const DevToolsRemoteMessage& message);
+  virtual void HandleMessage(const DevToolsRemoteMessage& message) OVERRIDE;
 
   // Gets invoked on the remote debugger [socket] connection loss.
   // Notifies the InspectableTabProxy of the remote debugger detachment.
-  virtual void OnConnectionLost();
+  virtual void OnConnectionLost() OVERRIDE;
 
   // Specifies a tool name ("V8Debugger") handled by this class.
   static const char kToolName[];
diff --git a/chrome/browser/debugger/devtools_protocol_handler.h b/chrome/browser/debugger/devtools_protocol_handler.h
index b1b9158d..03ddf16 100644
--- a/chrome/browser/debugger/devtools_protocol_handler.h
+++ b/chrome/browser/debugger/devtools_protocol_handler.h
@@ -51,12 +51,12 @@ class DevToolsProtocolHandler
   }
 
   // DevToolsRemoteListener interface
-  virtual void HandleMessage(const DevToolsRemoteMessage& message);
-  virtual void OnAcceptConnection(net::ListenSocket *connection);
-  virtual void OnConnectionLost();
+  virtual void HandleMessage(const DevToolsRemoteMessage& message) OVERRIDE;
+  virtual void OnAcceptConnection(net::ListenSocket *connection) OVERRIDE;
+  virtual void OnConnectionLost() OVERRIDE;
 
   // OutboundSocketDelegate interface
-  virtual void Send(const DevToolsRemoteMessage& message);
+  virtual void Send(const DevToolsRemoteMessage& message) OVERRIDE;
 
  private:
   explicit DevToolsProtocolHandler(int port);
diff --git a/chrome/browser/debugger/devtools_remote_listen_socket.h b/chrome/browser/debugger/devtools_remote_listen_socket.h
index 40212f4..ec97c86 100644
--- a/chrome/browser/debugger/devtools_remote_listen_socket.h
+++ b/chrome/browser/debugger/devtools_remote_listen_socket.h
@@ -27,20 +27,20 @@ class DevToolsRemoteListenSocket
       DevToolsRemoteListener* message_listener);
 
  protected:
-  virtual void Listen();
-  virtual void Accept();
-  virtual void Close();
-  virtual void SendInternal(const char* bytes, int len);
+  virtual void Listen() OVERRIDE;
+  virtual void Accept() OVERRIDE;
+  virtual void Close() OVERRIDE;
+  virtual void SendInternal(const char* bytes, int len) OVERRIDE;
 
  private:
   virtual ~DevToolsRemoteListenSocket();
 
   // net::ListenSocket::ListenSocketDelegate interface
   virtual void DidAccept(net::ListenSocket *server,
-                         net::ListenSocket *connection);
+                         net::ListenSocket *connection) OVERRIDE;
   virtual void DidRead(net::ListenSocket *connection,
-                       const char* data, int len);
-  virtual void DidClose(net::ListenSocket *connection);
+                       const char* data, int len) OVERRIDE;
+  virtual void DidClose(net::ListenSocket *connection) OVERRIDE;
 
   // The protocol states while reading socket input
   enum State {
diff --git a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h
index 0b9b36b..cb79650 100644
--- a/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h
+++ b/chrome/browser/debugger/devtools_remote_listen_socket_unittest.h
@@ -86,9 +86,9 @@ class DevToolsRemoteListenSocketTester :
   bool NextAction(int timeout);
 
   // DevToolsRemoteMessageHandler interface
-  virtual void HandleMessage(const DevToolsRemoteMessage& message);
-  virtual void OnAcceptConnection(net::ListenSocket* connection);
-  virtual void OnConnectionLost();
+  virtual void HandleMessage(const DevToolsRemoteMessage& message) OVERRIDE;
+  virtual void OnAcceptConnection(net::ListenSocket* connection) OVERRIDE;
+  virtual void OnConnectionLost() OVERRIDE;
 
   // read all pending data from the test socket
   int ClearTestSocket();
diff --git a/chrome/browser/debugger/devtools_remote_service.h b/chrome/browser/debugger/devtools_remote_service.h
index c06ccf5..7ce914c 100644
--- a/chrome/browser/debugger/devtools_remote_service.h
+++ b/chrome/browser/debugger/devtools_remote_service.h
@@ -29,8 +29,8 @@ class DevToolsRemoteService : public DevToolsRemoteListener {
   explicit DevToolsRemoteService(DevToolsProtocolHandler* delegate);
 
   // DevToolsRemoteListener interface
-  virtual void HandleMessage(const DevToolsRemoteMessage& message);
-  virtual void OnConnectionLost() {}
+  virtual void HandleMessage(const DevToolsRemoteMessage& message) OVERRIDE;
+  virtual void OnConnectionLost() OVERRIDE {}
 
   static const char kToolName[];
 
diff --git a/chrome/browser/debugger/devtools_window.h b/chrome/browser/debugger/devtools_window.h
index 311b2b7..8bdd58f 100644
--- a/chrome/browser/debugger/devtools_window.h
+++ b/chrome/browser/debugger/devtools_window.h
@@ -57,10 +57,10 @@ class DevToolsWindow
   virtual ~DevToolsWindow();
 
   // Overridden from DevToolsClientHost.
-  virtual void SendMessageToClient(const IPC::Message& message);
-  virtual void InspectedTabClosing();
-  virtual void TabReplaced(TabContents* new_tab);
-  virtual RenderViewHost* GetClientRenderViewHost();
+  virtual void SendMessageToClient(const IPC::Message& message) OVERRIDE;
+  virtual void InspectedTabClosing() OVERRIDE;
+  virtual void TabReplaced(TabContents* new_tab) OVERRIDE;
+  virtual RenderViewHost* GetClientRenderViewHost() OVERRIDE;
   RenderViewHost* GetRenderViewHost();
 
   void Show(DevToolsToggleAction action);
@@ -85,7 +85,7 @@ class DevToolsWindow
   // Overridden from content::NotificationObserver.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   void ScheduleAction(DevToolsToggleAction action);
   void DoAction();
@@ -109,15 +109,17 @@ class DevToolsWindow
                               TabContents* new_contents,
                               WindowOpenDisposition disposition,
                               const gfx::Rect& initial_pos,
-                              bool user_gesture);
-  virtual void CloseContents(TabContents* source) {}
-  virtual bool CanReloadContents(TabContents* source) const;
+                              bool user_gesture) OVERRIDE;
+  virtual void CloseContents(TabContents* source) OVERRIDE {}
+  virtual bool CanReloadContents(TabContents* source) const OVERRIDE;
   virtual bool PreHandleKeyboardEvent(const NativeWebKeyboardEvent& event,
-                                      bool* is_keyboard_shortcut);
-  virtual void HandleKeyboardEvent(const NativeWebKeyboardEvent& event);
-  virtual content::JavaScriptDialogCreator* GetJavaScriptDialogCreator();
+                                      bool* is_keyboard_shortcut) OVERRIDE;
+  virtual void HandleKeyboardEvent(
+      const NativeWebKeyboardEvent& event) OVERRIDE;
+  virtual content::JavaScriptDialogCreator*
+      GetJavaScriptDialogCreator() OVERRIDE;
 
-  virtual void FrameNavigating(const std::string& url) {}
+  virtual void FrameNavigating(const std::string& url) OVERRIDE {}
 
   static DevToolsWindow* ToggleDevToolsWindow(RenderViewHost* inspected_rvh,
                                               bool force_open,
diff --git a/chrome/browser/debugger/extension_ports_remote_service.h b/chrome/browser/debugger/extension_ports_remote_service.h
index ce1aa4a..f0796d4 100644
--- a/chrome/browser/debugger/extension_ports_remote_service.h
+++ b/chrome/browser/debugger/extension_ports_remote_service.h
@@ -44,17 +44,17 @@ class ExtensionPortsRemoteService : public DevToolsRemoteListener,
 
   // Processes |message| from the external client (where the tool is
   // "ExtensionPorts").
-  virtual void HandleMessage(const DevToolsRemoteMessage& message);
+  virtual void HandleMessage(const DevToolsRemoteMessage& message) OVERRIDE;
 
   // Gets invoked on the external client socket connection loss.
   // Closes open message ports.
-  virtual void OnConnectionLost();
+  virtual void OnConnectionLost() OVERRIDE;
 
   // IPC::Message::Sender methods:
 
   // This is the callback through which the ExtensionMessageService
   // passes us messages from extensions as well as disconnect events.
-  virtual bool Send(IPC::Message* msg);
+  virtual bool Send(IPC::Message* msg) OVERRIDE;
 
  private:
   // Operation result returned in the "result" field in messages sent
diff --git a/chrome/browser/debugger/inspectable_tab_proxy.h b/chrome/browser/debugger/inspectable_tab_proxy.h
index 90aef6b..ab1d6ce 100644
--- a/chrome/browser/debugger/inspectable_tab_proxy.h
+++ b/chrome/browser/debugger/inspectable_tab_proxy.h
@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/hash_tables.h"
 #include "content/browser/debugger/devtools_client_host.h"
 
@@ -72,14 +73,14 @@ class DevToolsClientHostImpl : public DevToolsClientHost {
   void CloseImpl();
 
   // DevToolsClientHost interface
-  virtual void InspectedTabClosing();
-  virtual void SendMessageToClient(const IPC::Message& msg);
-  virtual void TabReplaced(TabContents* new_tab);
+  virtual void InspectedTabClosing() OVERRIDE;
+  virtual void SendMessageToClient(const IPC::Message& msg) OVERRIDE;
+  virtual void TabReplaced(TabContents* new_tab) OVERRIDE;
 
  private:
   // Message handling routines
   void OnDebuggerOutput(const std::string& msg);
-  virtual void FrameNavigating(const std::string& url);
+  virtual void FrameNavigating(const std::string& url) OVERRIDE;
   void TabClosed();
 
   int32 id_;
diff --git a/chrome/browser/diagnostics/diagnostics_test.h b/chrome/browser/diagnostics/diagnostics_test.h
index 298d5a2..429121a 100644
--- a/chrome/browser/diagnostics/diagnostics_test.h
+++ b/chrome/browser/diagnostics/diagnostics_test.h
@@ -6,6 +6,7 @@
 #define CHROME_BROWSER_DIAGNOSTICS_DIAGNOSTICS_TEST_H_
 #pragma once
 
+#include "base/compiler_specific.h"
 #include "base/string16.h"
 #include "chrome/browser/diagnostics/diagnostics_model.h"
 
@@ -34,11 +35,11 @@ class DiagnosticTest : public DiagnosticsModel::TestInfo {
   bool Execute(DiagnosticsModel::Observer* observer, DiagnosticsModel* model,
                size_t index);
 
-  virtual string16 GetTitle();
+  virtual string16 GetTitle() OVERRIDE;
 
-  virtual DiagnosticsModel::TestResult GetResult();
+  virtual DiagnosticsModel::TestResult GetResult() OVERRIDE;
 
-  virtual string16 GetAdditionalInfo();
+  virtual string16 GetAdditionalInfo() OVERRIDE;
 
   void RecordStopFailure(const string16& additional_info) {
     RecordOutcome(additional_info, DiagnosticsModel::TEST_FAIL_STOP);
diff --git a/chrome/browser/download/download_file_picker.h b/chrome/browser/download/download_file_picker.h
index f916b97..79dc484 100644
--- a/chrome/browser/download/download_file_picker.h
+++ b/chrome/browser/download/download_file_picker.h
@@ -24,12 +24,14 @@ class DownloadFilePicker : public DownloadManager::Observer,
 
  private:
   // DownloadManager::Observer implementation.
-  virtual void ModelChanged();
-  virtual void ManagerGoingDown();
+  virtual void ModelChanged() OVERRIDE;
+  virtual void ManagerGoingDown() OVERRIDE;
 
   // SelectFileDialog::Listener implementation.
-  virtual void FileSelected(const FilePath& path, int index, void* params);
-  virtual void FileSelectionCanceled(void* params);
+  virtual void FileSelected(const FilePath& path,
+                            int index,
+                            void* params) OVERRIDE;
+  virtual void FileSelectionCanceled(void* params) OVERRIDE;
 
   DownloadManager* download_manager_;
 
diff --git a/chrome/browser/download/download_item_model.h b/chrome/browser/download/download_item_model.h
index d8327d3..45dc90e 100644
--- a/chrome/browser/download/download_item_model.h
+++ b/chrome/browser/download/download_item_model.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.
 
@@ -9,6 +9,7 @@
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/compiler_specific.h"
 #include "base/string16.h"
 
 class DownloadItem;
@@ -43,10 +44,10 @@ class DownloadItemModel : public BaseDownloadItemModel {
   virtual ~DownloadItemModel() { }
 
   // Cancel the downloading.
-  virtual void CancelTask();
+  virtual void CancelTask() OVERRIDE;
 
   // Get downloading status text.
-  virtual string16 GetStatusText();
+  virtual string16 GetStatusText() OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DownloadItemModel);
@@ -61,10 +62,10 @@ class SavePageModel : public BaseDownloadItemModel {
   virtual ~SavePageModel() { }
 
   // Cancel the page saving.
-  virtual void CancelTask();
+  virtual void CancelTask() OVERRIDE;
 
   // Get page saving status text.
-  virtual string16 GetStatusText();
+  virtual string16 GetStatusText() OVERRIDE;
 
  private:
   // Saving page management.
diff --git a/chrome/browser/download/download_request_limiter.h b/chrome/browser/download/download_request_limiter.h
index d7c6a7f..0224e89 100644
--- a/chrome/browser/download/download_request_limiter.h
+++ b/chrome/browser/download/download_request_limiter.h
@@ -133,7 +133,7 @@ class DownloadRequestLimiter
     // content::NotificationObserver method.
     virtual void Observe(int type,
                          const content::NotificationSource& source,
-                         const content::NotificationDetails& details);
+                         const content::NotificationDetails& details) OVERRIDE;
 
     // Notifies the callbacks as to whether the download is allowed or not.
     // Updates status_ appropriately.
diff --git a/chrome/browser/download/download_throttling_resource_handler.h b/chrome/browser/download/download_throttling_resource_handler.h
index e17e3a3f..5c13a16 100644
--- a/chrome/browser/download/download_throttling_resource_handler.h
+++ b/chrome/browser/download/download_throttling_resource_handler.h
@@ -43,22 +43,29 @@ class DownloadThrottlingResourceHandler
   // ResourceHanlder implementation:
   virtual bool OnUploadProgress(int request_id,
                                 uint64 position,
-                                uint64 size);
-  virtual bool OnRequestRedirected(int request_id, const GURL& url,
-                                   ResourceResponse* response, bool* defer);
-  virtual bool OnResponseStarted(int request_id, ResourceResponse* response);
-  virtual bool OnWillStart(int request_id, const GURL& url, bool* defer);
-  virtual bool OnWillRead(int request_id, net::IOBuffer** buf, int* buf_size,
-                          int min_size);
-  virtual bool OnReadCompleted(int request_id, int* bytes_read);
+                                uint64 size) OVERRIDE;
+  virtual bool OnRequestRedirected(int request_id,
+                                   const GURL& url,
+                                   ResourceResponse* response,
+                                   bool* defer) OVERRIDE;
+  virtual bool OnResponseStarted(int request_id,
+                                 ResourceResponse* response) OVERRIDE;
+  virtual bool OnWillStart(int request_id,
+                           const GURL& url,
+                           bool* defer) OVERRIDE;
+  virtual bool OnWillRead(int request_id,
+                          net::IOBuffer** buf,
+                          int* buf_size,
+                          int min_size) OVERRIDE;
+  virtual bool OnReadCompleted(int request_id, int* bytes_read) OVERRIDE;
   virtual bool OnResponseCompleted(int request_id,
                                    const net::URLRequestStatus& status,
-                                   const std::string& security_info);
-  virtual void OnRequestClosed();
+                                   const std::string& security_info) OVERRIDE;
+  virtual void OnRequestClosed() OVERRIDE;
 
   // DownloadRequestLimiter::Callback implementation:
-  virtual void CancelDownload();
-  virtual void ContinueDownload();
+  virtual void CancelDownload() OVERRIDE;
+  virtual void ContinueDownload() OVERRIDE;
 
  private:
   virtual ~DownloadThrottlingResourceHandler();
diff --git a/chrome/browser/download/save_package_file_picker.h b/chrome/browser/download/save_package_file_picker.h
index 51bc35b..86b74a6 100644
--- a/chrome/browser/download/save_package_file_picker.h
+++ b/chrome/browser/download/save_package_file_picker.h
@@ -29,8 +29,10 @@ class SavePackageFilePicker : public SelectFileDialog::Listener {
 
  private:
   // SelectFileDialog::Listener implementation.
-  virtual void FileSelected(const FilePath& path, int index, void* params);
-  virtual void FileSelectionCanceled(void* params);
+  virtual void FileSelected(const FilePath& path,
+                            int index,
+                            void* params) OVERRIDE;
+  virtual void FileSelectionCanceled(void* params) OVERRIDE;
 
   base::WeakPtr<SavePackage> save_package_;
 
diff --git a/chrome/browser/file_select_helper.h b/chrome/browser/file_select_helper.h
index 471e3e5..324afad 100644
--- a/chrome/browser/file_select_helper.h
+++ b/chrome/browser/file_select_helper.h
@@ -55,10 +55,10 @@ class FileSelectHelper
           id_(id) {}
     virtual ~DirectoryListerDispatchDelegate() {}
     virtual void OnListFile(
-        const net::DirectoryLister::DirectoryListerData& data) {
+        const net::DirectoryLister::DirectoryListerData& data) OVERRIDE {
       parent_->OnListFile(id_, data);
     }
-    virtual void OnListDone(int error) {
+    virtual void OnListDone(int error) OVERRIDE {
       parent_->OnListDone(id_, error);
     }
    private:
diff --git a/chrome/browser/geolocation/chrome_access_token_store.h b/chrome/browser/geolocation/chrome_access_token_store.h
index 9bd6707..f61d3976 100644
--- a/chrome/browser/geolocation/chrome_access_token_store.h
+++ b/chrome/browser/geolocation/chrome_access_token_store.h
@@ -24,9 +24,10 @@ class ChromeAccessTokenStore : public AccessTokenStore {
 
   // AccessTokenStore
   virtual void DoLoadAccessTokens(
-      scoped_refptr<CancelableRequest<LoadAccessTokensCallbackType> > request);
+      scoped_refptr<CancelableRequest<LoadAccessTokensCallbackType> > request)
+          OVERRIDE;
   virtual void SaveAccessToken(
-      const GURL& server_url, const string16& access_token);
+      const GURL& server_url, const string16& access_token) OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeAccessTokenStore);
 };
diff --git a/chrome/browser/geolocation/chrome_geolocation_permission_context.h b/chrome/browser/geolocation/chrome_geolocation_permission_context.h
index 2195362..1b250d2 100644
--- a/chrome/browser/geolocation/chrome_geolocation_permission_context.h
+++ b/chrome/browser/geolocation/chrome_geolocation_permission_context.h
@@ -29,15 +29,17 @@ class ChromeGeolocationPermissionContext : public GeolocationPermissionContext {
                            bool allowed);
 
   // GeolocationPermissionContext
-  virtual void RequestGeolocationPermission(int render_process_id,
-                                            int render_view_id,
-                                            int bridge_id,
-                                            const GURL& requesting_frame);
-
-  virtual void CancelGeolocationPermissionRequest(int render_process_id,
-                                                  int render_view_id,
-                                                  int bridge_id,
-                                                  const GURL& requesting_frame);
+  virtual void RequestGeolocationPermission(
+      int render_process_id,
+      int render_view_id,
+      int bridge_id,
+      const GURL& requesting_frame) OVERRIDE;
+
+  virtual void CancelGeolocationPermissionRequest(
+      int render_process_id,
+      int render_view_id,
+      int bridge_id,
+      const GURL& requesting_frame) OVERRIDE;
 
  private:
   virtual ~ChromeGeolocationPermissionContext();
diff --git a/chrome/browser/google/google_url_tracker.h b/chrome/browser/google/google_url_tracker.h
index 8cf99b5..c3d5d5e 100644
--- a/chrome/browser/google/google_url_tracker.h
+++ b/chrome/browser/google/google_url_tracker.h
@@ -106,15 +106,15 @@ class GoogleURLTracker : public content::URLFetcherDelegate,
   void StartFetchIfDesirable();
 
   // content::URLFetcherDelegate
-  virtual void OnURLFetchComplete(const content::URLFetcher* source);
+  virtual void OnURLFetchComplete(const content::URLFetcher* source) OVERRIDE;
 
   // content::NotificationObserver
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // NetworkChangeNotifier::IPAddressObserver
-  virtual void OnIPAddressChanged();
+  virtual void OnIPAddressChanged() OVERRIDE;
 
   void SearchCommitted();
   void OnNavigationPending(const content::NotificationSource& source,
diff --git a/chrome/browser/history/archived_database.h b/chrome/browser/history/archived_database.h
index 7303d35..053a490 100644
--- a/chrome/browser/history/archived_database.h
+++ b/chrome/browser/history/archived_database.h
@@ -41,7 +41,7 @@ class ArchivedDatabase : public URLDatabase,
 
  private:
   // Implemented for the specialized databases.
-  virtual sql::Connection& GetDB();
+  virtual sql::Connection& GetDB() OVERRIDE;
 
   // Makes sure the version is up-to-date, updating if necessary. If the
   // database is too old to migrate, the user will be notified. In this case, or
diff --git a/chrome/browser/history/history.h b/chrome/browser/history/history.h
index ccfd045..b205dc4 100644
--- a/chrome/browser/history/history.h
+++ b/chrome/browser/history/history.h
@@ -595,7 +595,7 @@ class HistoryService : public CancelableRequestProvider,
   // Implementation of content::NotificationObserver.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // Low-level Init().  Same as the public version, but adds a |no_db| parameter
   // that is only set by unittests which causes the backend to not init its DB.
diff --git a/chrome/browser/history/history_backend.h b/chrome/browser/history/history_backend.h
index 1ecf80c..9600df1 100644
--- a/chrome/browser/history/history_backend.h
+++ b/chrome/browser/history/history_backend.h
@@ -515,7 +515,7 @@ class HistoryBackend : public base::RefCountedThreadSafe<HistoryBackend>,
   // details argument will have ownership taken by this function (it will be
   // sent to the main thread and deleted there).
   virtual void BroadcastNotifications(int type,
-                                      HistoryDetails* details_deleted);
+                                      HistoryDetails* details_deleted) OVERRIDE;
 
   // Deleting all history ------------------------------------------------------
 
diff --git a/chrome/browser/history/history_database.h b/chrome/browser/history/history_database.h
index f027ebb..77a00b8 100644
--- a/chrome/browser/history/history_database.h
+++ b/chrome/browser/history/history_database.h
@@ -146,7 +146,7 @@ class HistoryDatabase : public DownloadDatabase,
   FRIEND_TEST_ALL_PREFIXES(IconMappingMigrationTest, TestIconMappingMigration);
 
   // Implemented for URLDatabase.
-  virtual sql::Connection& GetDB();
+  virtual sql::Connection& GetDB() OVERRIDE;
 
   // Migration -----------------------------------------------------------------
 
diff --git a/chrome/browser/history/history_tab_helper.h b/chrome/browser/history/history_tab_helper.h
index a7b31bc..b5f83ef 100644
--- a/chrome/browser/history/history_tab_helper.h
+++ b/chrome/browser/history/history_tab_helper.h
@@ -42,18 +42,18 @@ class HistoryTabHelper : public TabContentsObserver,
 
  private:
   // TabContentsObserver implementation.
-  virtual bool OnMessageReceived(const IPC::Message& message);
+  virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
   virtual void DidNavigateMainFrame(
       const content::LoadCommittedDetails& details,
-      const ViewHostMsg_FrameNavigate_Params& params);
+      const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE;
   virtual void DidNavigateAnyFrame(
       const content::LoadCommittedDetails& details,
-      const ViewHostMsg_FrameNavigate_Params& params);
+      const ViewHostMsg_FrameNavigate_Params& params) OVERRIDE;
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   void OnPageContents(const GURL& url,
                       int32 page_id,
diff --git a/chrome/browser/history/in_memory_database.h b/chrome/browser/history/in_memory_database.h
index f6121d4..48bb898 100644
--- a/chrome/browser/history/in_memory_database.h
+++ b/chrome/browser/history/in_memory_database.h
@@ -33,7 +33,7 @@ class InMemoryDatabase : public URLDatabase {
 
  protected:
   // Implemented for URLDatabase.
-  virtual sql::Connection& GetDB();
+  virtual sql::Connection& GetDB() OVERRIDE;
 
  private:
   // Initializes the database connection, this is the shared code between
diff --git a/chrome/browser/history/in_memory_history_backend.h b/chrome/browser/history/in_memory_history_backend.h
index b280b5e..16b2907 100644
--- a/chrome/browser/history/in_memory_history_backend.h
+++ b/chrome/browser/history/in_memory_history_backend.h
@@ -67,7 +67,7 @@ class InMemoryHistoryBackend : public content::NotificationObserver {
   // Notification callback.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // Return the quick history index.
   history::InMemoryURLIndex* InMemoryIndex() const { return index_.get(); }
diff --git a/chrome/browser/history/top_sites.h b/chrome/browser/history/top_sites.h
index 0ddce35a..5423fac 100644
--- a/chrome/browser/history/top_sites.h
+++ b/chrome/browser/history/top_sites.h
@@ -295,7 +295,7 @@ class TopSites
   // Implementation of content::NotificationObserver.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // Resets top_sites_ and updates the db (in the background). All mutations to
   // top_sites_ *must* go through this.
diff --git a/chrome/browser/icon_manager.h b/chrome/browser/icon_manager.h
index 3622203..dd68af6 100644
--- a/chrome/browser/icon_manager.h
+++ b/chrome/browser/icon_manager.h
@@ -85,7 +85,7 @@ class IconManager : public IconLoader::Delegate,
                   const IconRequestCallback& callback);
 
   // IconLoader::Delegate interface.
-  virtual bool OnImageLoaded(IconLoader* source, gfx::Image* result);
+  virtual bool OnImageLoaded(IconLoader* source, gfx::Image* result) OVERRIDE;
 
   // Get the identifying string for the given file. The implementation
   // is in icon_manager_[platform].cc.
diff --git a/chrome/browser/importer/toolbar_importer.h b/chrome/browser/importer/toolbar_importer.h
index 5c14f32..2e8ddb1 100644
--- a/chrome/browser/importer/toolbar_importer.h
+++ b/chrome/browser/importer/toolbar_importer.h
@@ -46,10 +46,10 @@ class Toolbar5Importer : public content::URLFetcherDelegate, public Importer {
   // Importer view call this method when the user clicks the cancel button
   // in the tabbed options UI.  We need to post a message to our loop
   // to cancel network retrieval.
-  virtual void Cancel();
+  virtual void Cancel() OVERRIDE;
 
   // content::URLFetcherDelegate method called back from the URLFetcher object.
-  virtual void OnURLFetchComplete(const content::URLFetcher* source);
+  virtual void OnURLFetchComplete(const content::URLFetcher* source) OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(Toolbar5ImporterTest, BookmarkParse);
diff --git a/chrome/browser/infobars/infobar_extension_api.h b/chrome/browser/infobars/infobar_extension_api.h
index 2bb54091..b3d95df 100644
--- a/chrome/browser/infobars/infobar_extension_api.h
+++ b/chrome/browser/infobars/infobar_extension_api.h
@@ -10,7 +10,7 @@
 
 class ShowInfoBarFunction : public SyncExtensionFunction {
   virtual ~ShowInfoBarFunction() {}
-  virtual bool RunImpl();
+  virtual bool RunImpl() OVERRIDE;
   DECLARE_EXTENSION_FUNCTION_NAME("experimental.infobars.show")
 };
 
diff --git a/chrome/browser/intents/web_intents_registry.h b/chrome/browser/intents/web_intents_registry.h
index 571cc24..5a9e5f0 100644
--- a/chrome/browser/intents/web_intents_registry.h
+++ b/chrome/browser/intents/web_intents_registry.h
@@ -85,8 +85,9 @@ class WebIntentsRegistry
   typedef base::hash_map<WebDataService::Handle, IntentsQuery*> QueryMap;
 
   // WebDataServiceConsumer implementation.
-  virtual void OnWebDataServiceRequestDone(WebDataService::Handle h,
-                                           const WDTypedResult* result);
+  virtual void OnWebDataServiceRequestDone(
+      WebDataService::Handle h,
+      const WDTypedResult* result) OVERRIDE;
 
   // Map for all in-flight web data requests/intent queries.
   QueryMap queries_;
diff --git a/chrome/browser/intents/web_intents_registry_factory.h b/chrome/browser/intents/web_intents_registry_factory.h
index 05ea36b8..7a90da8 100644
--- a/chrome/browser/intents/web_intents_registry_factory.h
+++ b/chrome/browser/intents/web_intents_registry_factory.h
@@ -31,8 +31,9 @@ class WebIntentsRegistryFactory : public ProfileKeyedServiceFactory {
   virtual ~WebIntentsRegistryFactory();
 
   // ProfileKeyedServiceFactory implementation.
-  virtual ProfileKeyedService* BuildServiceInstanceFor(Profile* profile) const;
-  virtual bool ServiceRedirectedInIncognito();
+  virtual ProfileKeyedService* BuildServiceInstanceFor(
+      Profile* profile) const OVERRIDE;
+  virtual bool ServiceRedirectedInIncognito() OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(WebIntentsRegistryFactory);
 };
diff --git a/chrome/browser/intranet_redirect_detector.h b/chrome/browser/intranet_redirect_detector.h
index 8931c13..ac40ba2 100644
--- a/chrome/browser/intranet_redirect_detector.h
+++ b/chrome/browser/intranet_redirect_detector.h
@@ -66,10 +66,10 @@ class IntranetRedirectDetector
   void FinishSleep();
 
   // content::URLFetcherDelegate
-  virtual void OnURLFetchComplete(const content::URLFetcher* source);
+  virtual void OnURLFetchComplete(const content::URLFetcher* source) OVERRIDE;
 
   // NetworkChangeNotifier::IPAddressObserver
-  virtual void OnIPAddressChanged();
+  virtual void OnIPAddressChanged() OVERRIDE;
 
   GURL redirect_origin_;
   ScopedRunnableMethodFactory<IntranetRedirectDetector> fetcher_factory_;
@@ -92,7 +92,7 @@ class IntranetRedirectHostResolverProc : public net::HostResolverProc {
                       net::AddressFamily address_family,
                       net::HostResolverFlags host_resolver_flags,
                       net::AddressList* addrlist,
-                      int* os_error);
+                      int* os_error) OVERRIDE;
 };
 
 #endif  // CHROME_BROWSER_INTRANET_REDIRECT_DETECTOR_H_
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
index 3f86173..b8be74b 100644
--- a/chrome/browser/io_thread.h
+++ b/chrome/browser/io_thread.h
@@ -110,8 +110,8 @@ class IOThread : public content::BrowserProcessSubThread {
   void ClearHostCache();
 
  protected:
-  virtual void Init();
-  virtual void CleanUp();
+  virtual void Init() OVERRIDE;
+  virtual void CleanUp() OVERRIDE;
 
  private:
   // Provide SystemURLRequestContextGetter with access to
diff --git a/chrome/browser/media/media_internals.h b/chrome/browser/media/media_internals.h
index a5b62e1..b3e8d96 100644
--- a/chrome/browser/media/media_internals.h
+++ b/chrome/browser/media/media_internals.h
@@ -25,13 +25,18 @@ class MediaInternals : public MediaObserver, public base::NonThreadSafe {
   virtual ~MediaInternals();
 
   // MediaObserver implementation.
-  virtual void OnDeleteAudioStream(void* host, int stream_id);
-  virtual void OnSetAudioStreamPlaying(void* host, int stream_id, bool playing);
-  virtual void OnSetAudioStreamStatus(void* host, int stream_id,
-                                      const std::string& status);
-  virtual void OnSetAudioStreamVolume(void* host, int stream_id, double volume);
+  virtual void OnDeleteAudioStream(void* host, int stream_id) OVERRIDE;
+  virtual void OnSetAudioStreamPlaying(void* host,
+                                       int stream_id,
+                                       bool playing) OVERRIDE;
+  virtual void OnSetAudioStreamStatus(void* host,
+                                      int stream_id,
+                                      const std::string& status) OVERRIDE;
+  virtual void OnSetAudioStreamVolume(void* host,
+                                      int stream_id,
+                                      double volume) OVERRIDE;
   virtual void OnMediaEvent(int render_process_id,
-                            const media::MediaLogEvent& event);
+                            const media::MediaLogEvent& event) OVERRIDE;
 
   // Methods for observers.
   // Observers should add themselves on construction and remove themselves
diff --git a/chrome/browser/metrics/field_trial_synchronizer.h b/chrome/browser/metrics/field_trial_synchronizer.h
index eb2cc73..00d5b80 100644
--- a/chrome/browser/metrics/field_trial_synchronizer.h
+++ b/chrome/browser/metrics/field_trial_synchronizer.h
@@ -48,8 +48,9 @@ class FieldTrialSynchronizer
   // is finalized. This method contacts all renderers (by calling
   // NotifyAllRenderers) to create a FieldTrial that carries the randomly
   // selected state from the browser process into all the renderer processes.
-  virtual void OnFieldTrialGroupFinalized(const std::string& name,
-                                          const std::string& group_name);
+  virtual void OnFieldTrialGroupFinalized(
+      const std::string& name,
+      const std::string& group_name) OVERRIDE;
 
  private:
   // This singleton instance should be constructed during the single threaded
diff --git a/chrome/browser/metrics/metrics_log.h b/chrome/browser/metrics/metrics_log.h
index 0903b14..026792c 100644
--- a/chrome/browser/metrics/metrics_log.h
+++ b/chrome/browser/metrics/metrics_log.h
@@ -63,7 +63,7 @@ class MetricsLog : public MetricsLogBase {
   // Get the current version of the application as a string.
   static std::string GetVersionString();
 
-  virtual MetricsLog* AsMetricsLog();
+  virtual MetricsLog* AsMetricsLog() OVERRIDE;
 
   // Use |extension| in all uploaded appversions in addition to the standard
   // version string.
diff --git a/chrome/browser/metrics/metrics_log_serializer.h b/chrome/browser/metrics/metrics_log_serializer.h
index d698164..bb95305 100644
--- a/chrome/browser/metrics/metrics_log_serializer.h
+++ b/chrome/browser/metrics/metrics_log_serializer.h
@@ -38,9 +38,9 @@ class MetricsLogSerializer : public MetricsLogManager::LogSerializer {
 
   // Implementation of MetricsLogManager::LogSerializer
   virtual void SerializeLogs(const std::vector<std::string>& logs,
-                             MetricsLogManager::LogType log_type);
+                             MetricsLogManager::LogType log_type) OVERRIDE;
   virtual void DeserializeLogs(MetricsLogManager::LogType log_type,
-                               std::vector<std::string>* logs);
+                               std::vector<std::string>* logs) OVERRIDE;
 
  private:
   // Encodes the textual log data from |local_list| and writes it to the given
diff --git a/chrome/browser/metrics/metrics_service.h b/chrome/browser/metrics/metrics_service.h
index d3deb05..fe9bdd7 100644
--- a/chrome/browser/metrics/metrics_service.h
+++ b/chrome/browser/metrics/metrics_service.h
@@ -86,7 +86,7 @@ class MetricsService : public content::NotificationObserver,
   // Implementation of content::NotificationObserver
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // Invoked when we get a WM_SESSIONEND. This places a value in prefs that is
   // reset when RecordCompletedSessionEnd is invoked.
@@ -234,7 +234,7 @@ class MetricsService : public content::NotificationObserver,
 
   // Implementation of content::URLFetcherDelegate. Called after transmission
   // completes (either successfully or with failure).
-  virtual void OnURLFetchComplete(const content::URLFetcher* source);
+  virtual void OnURLFetchComplete(const content::URLFetcher* source) OVERRIDE;
 
   // Logs debugging details, for the case where the server returns a response
   // code other than 200.
diff --git a/chrome/browser/metrics/thread_watcher.h b/chrome/browser/metrics/thread_watcher.h
index 64d9058..588a362 100644
--- a/chrome/browser/metrics/thread_watcher.h
+++ b/chrome/browser/metrics/thread_watcher.h
@@ -434,7 +434,7 @@ class ThreadWatcherObserver : public content::NotificationObserver {
   // is called.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // The singleton of this class.
   static ThreadWatcherObserver* g_thread_watcher_observer_;
@@ -477,8 +477,8 @@ class WatchDogThread : public base::Thread {
                               int64 delay_ms);
 
  protected:
-  virtual void Init();
-  virtual void CleanUp();
+  virtual void Init() OVERRIDE;
+  virtual void CleanUp() OVERRIDE;
 
  private:
   static bool PostTaskHelper(
diff --git a/chrome/browser/mock_browsing_data_cookie_helper.h b/chrome/browser/mock_browsing_data_cookie_helper.h
index 723e9b5..2eb05e7 100644
--- a/chrome/browser/mock_browsing_data_cookie_helper.h
+++ b/chrome/browser/mock_browsing_data_cookie_helper.h
@@ -18,9 +18,10 @@ class MockBrowsingDataCookieHelper : public BrowsingDataCookieHelper {
 
   // BrowsingDataCookieHelper methods.
   virtual void StartFetching(
-      const net::CookieMonster::GetCookieListCallback &callback);
-  virtual void CancelNotification();
-  virtual void DeleteCookie(const net::CookieMonster::CanonicalCookie& cookie);
+      const net::CookieMonster::GetCookieListCallback &callback) OVERRIDE;
+  virtual void CancelNotification() OVERRIDE;
+  virtual void DeleteCookie(
+      const net::CookieMonster::CanonicalCookie& cookie) OVERRIDE;
 
   // Adds some cookie samples.
   void AddCookieSamples(const GURL& url, const std::string& cookie_line);
diff --git a/chrome/browser/mock_browsing_data_database_helper.h b/chrome/browser/mock_browsing_data_database_helper.h
index 4d19090..72f33e0 100644
--- a/chrome/browser/mock_browsing_data_database_helper.h
+++ b/chrome/browser/mock_browsing_data_database_helper.h
@@ -23,10 +23,10 @@ class MockBrowsingDataDatabaseHelper : public BrowsingDataDatabaseHelper {
       const base::Callback<void(const std::list<DatabaseInfo>&)>& callback)
           OVERRIDE;
 
-  virtual void CancelNotification();
+  virtual void CancelNotification() OVERRIDE;
 
   virtual void DeleteDatabase(const std::string& origin,
-      const std::string& name);
+      const std::string& name) OVERRIDE;
 
   // Adds some DatabaseInfo samples.
   void AddDatabaseSamples();
diff --git a/chrome/browser/mock_keychain_mac.h b/chrome/browser/mock_keychain_mac.h
index f614cef..662a524 100644
--- a/chrome/browser/mock_keychain_mac.h
+++ b/chrome/browser/mock_keychain_mac.h
@@ -10,6 +10,7 @@
 #include <string>
 #include <vector>
 
+#include "base/compiler_specific.h"
 #include "chrome/browser/keychain_mac.h"
 
 // Mock Keychain wrapper for testing code that interacts with the OS Keychain.
@@ -28,55 +29,58 @@ class MockKeychain : public MacKeychain {
   virtual OSStatus ItemCopyAttributesAndData(
       SecKeychainItemRef itemRef, SecKeychainAttributeInfo *info,
       SecItemClass *itemClass, SecKeychainAttributeList **attrList,
-      UInt32 *length, void **outData) const;
+      UInt32 *length, void **outData) const OVERRIDE;
   // Pass "fail_me" as the data to get errSecAuthFailed.
   virtual OSStatus ItemModifyAttributesAndData(
       SecKeychainItemRef itemRef, const SecKeychainAttributeList *attrList,
-      UInt32 length, const void *data) const;
+      UInt32 length, const void *data) const OVERRIDE;
   virtual OSStatus ItemFreeAttributesAndData(SecKeychainAttributeList *attrList,
-                                             void *data) const;
-  virtual OSStatus ItemDelete(SecKeychainItemRef itemRef) const;
+                                             void *data) const OVERRIDE;
+  virtual OSStatus ItemDelete(SecKeychainItemRef itemRef) const OVERRIDE;
   virtual OSStatus SearchCreateFromAttributes(
       CFTypeRef keychainOrArray, SecItemClass itemClass,
       const SecKeychainAttributeList *attrList,
-      SecKeychainSearchRef *searchRef) const;
+      SecKeychainSearchRef *searchRef) const OVERRIDE;
   virtual OSStatus SearchCopyNext(SecKeychainSearchRef searchRef,
-                                  SecKeychainItemRef *itemRef) const;
+                                  SecKeychainItemRef *itemRef) const OVERRIDE;
   // If there are unused slots in the Mock Keychain's capacity, the new item
   // will use the first free one, otherwise it will stomp the last item.
   // Pass "some.domain.com" as the serverName to get errSecDuplicateItem.
-  virtual OSStatus AddInternetPassword(SecKeychainRef keychain,
-                                       UInt32 serverNameLength,
-                                       const char *serverName,
-                                       UInt32 securityDomainLength,
-                                       const char *securityDomain,
-                                       UInt32 accountNameLength,
-                                       const char *accountName,
-                                       UInt32 pathLength, const char *path,
-                                       UInt16 port, SecProtocolType protocol,
-                                       SecAuthenticationType authenticationType,
-                                       UInt32 passwordLength,
-                                       const void *passwordData,
-                                       SecKeychainItemRef *itemRef) const;
-  virtual OSStatus FindGenericPassword(CFTypeRef keychainOrArray,
-                                       UInt32 serviceNameLength,
-                                       const char *serviceName,
-                                       UInt32 accountNameLength,
-                                       const char *accountName,
-                                       UInt32 *passwordLength,
-                                       void **passwordData,
-                                       SecKeychainItemRef *itemRef) const;
+  virtual OSStatus AddInternetPassword(
+      SecKeychainRef keychain,
+      UInt32 serverNameLength,
+      const char *serverName,
+      UInt32 securityDomainLength,
+      const char *securityDomain,
+      UInt32 accountNameLength,
+      const char *accountName,
+      UInt32 pathLength, const char *path,
+      UInt16 port, SecProtocolType protocol,
+      SecAuthenticationType authenticationType,
+      UInt32 passwordLength,
+      const void *passwordData,
+      SecKeychainItemRef *itemRef) const OVERRIDE;
+  virtual OSStatus FindGenericPassword(
+      CFTypeRef keychainOrArray,
+      UInt32 serviceNameLength,
+      const char *serviceName,
+      UInt32 accountNameLength,
+      const char *accountName,
+      UInt32 *passwordLength,
+      void **passwordData,
+      SecKeychainItemRef *itemRef) const OVERRIDE;
   virtual OSStatus ItemFreeContent(SecKeychainAttributeList *attrList,
-                                   void *data) const;
-  virtual OSStatus AddGenericPassword(SecKeychainRef keychain,
-                                      UInt32 serviceNameLength,
-                                      const char *serviceName,
-                                      UInt32 accountNameLength,
-                                      const char *accountName,
-                                      UInt32 passwordLength,
-                                      const void *passwordData,
-                                      SecKeychainItemRef *itemRef) const;
-  virtual void Free(CFTypeRef ref) const;
+                                   void *data) const OVERRIDE;
+  virtual OSStatus AddGenericPassword(
+      SecKeychainRef keychain,
+      UInt32 serviceNameLength,
+      const char *serviceName,
+      UInt32 accountNameLength,
+      const char *accountName,
+      UInt32 passwordLength,
+      const void *passwordData,
+      SecKeychainItemRef *itemRef) const OVERRIDE;
+  virtual void Free(CFTypeRef ref) const OVERRIDE;
 
   // Return the counts of objects returned by Create/Copy functions but never
   // Free'd as they should have been.
diff --git a/chrome/browser/nacl_host/nacl_process_host.h b/chrome/browser/nacl_host/nacl_process_host.h
index ce73491..1ccb0f8 100644
--- a/chrome/browser/nacl_host/nacl_process_host.h
+++ b/chrome/browser/nacl_host/nacl_process_host.h
@@ -36,13 +36,14 @@ class NaClProcessHost : public BrowserChildProcessHost {
               int socket_count,
               IPC::Message* reply_msg);
 
-  virtual bool OnMessageReceived(const IPC::Message& msg);
+  virtual bool OnMessageReceived(const IPC::Message& msg) OVERRIDE;
 
   void OnProcessLaunchedByBroker(base::ProcessHandle handle);
 
  protected:
-  virtual base::TerminationStatus GetChildTerminationStatus(int* exit_code);
-  virtual void OnChildDied();
+  virtual base::TerminationStatus GetChildTerminationStatus(
+      int* exit_code) OVERRIDE;
+  virtual void OnChildDied() OVERRIDE;
 
  private:
   // Internal class that holds the nacl::Handle objecs so that
@@ -53,12 +54,12 @@ class NaClProcessHost : public BrowserChildProcessHost {
 
   bool LaunchSelLdr();
 
-  virtual void OnProcessLaunched();
+  virtual void OnProcessLaunched() OVERRIDE;
 
   void IrtReady();
   void SendStart(base::PlatformFile irt_file);
 
-  virtual bool CanShutdown();
+  virtual bool CanShutdown() OVERRIDE;
 
  private:
   // The ChromeRenderMessageFilter that requested this NaCl process.  We use
diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h
index 359e5b9..854a098 100644
--- a/chrome/browser/net/chrome_url_request_context.h
+++ b/chrome/browser/net/chrome_url_request_context.h
@@ -41,7 +41,7 @@ class ChromeURLRequestContext : public net::URLRequestContext {
     return is_incognito_;
   }
 
-  virtual const std::string& GetUserAgent(const GURL& url) const;
+  virtual const std::string& GetUserAgent(const GURL& url) const OVERRIDE;
 
   // TODO(willchan): Get rid of the need for this accessor. Really, this should
   // move completely to ProfileIOData.
@@ -102,9 +102,10 @@ class ChromeURLRequestContextGetter : public net::URLRequestContextGetter,
   // GetIOMessageLoopProxy however can be called from any thread.
   //
   // net::URLRequestContextGetter implementation.
-  virtual net::URLRequestContext* GetURLRequestContext();
-  virtual net::CookieStore* DONTUSEME_GetCookieStore();
-  virtual scoped_refptr<base::MessageLoopProxy> GetIOMessageLoopProxy() const;
+  virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE;
+  virtual net::CookieStore* DONTUSEME_GetCookieStore() OVERRIDE;
+  virtual scoped_refptr<base::MessageLoopProxy>
+      GetIOMessageLoopProxy() const OVERRIDE;
 
   // Convenience overload of GetURLRequestContext() that returns a
   // ChromeURLRequestContext* rather than a net::URLRequestContext*.
@@ -159,7 +160,7 @@ class ChromeURLRequestContextGetter : public net::URLRequestContextGetter,
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
  private:
   // Must be called on the IO thread.
diff --git a/chrome/browser/net/gaia/token_service.h b/chrome/browser/net/gaia/token_service.h
index 234705c..346cdf2 100644
--- a/chrome/browser/net/gaia/token_service.h
+++ b/chrome/browser/net/gaia/token_service.h
@@ -162,9 +162,9 @@ class TokenService : public GaiaAuthConsumer,
   // GaiaAuthConsumer implementation.
   virtual void OnIssueAuthTokenSuccess(const std::string& service,
                                        const std::string& auth_token) OVERRIDE;
-  virtual void OnIssueAuthTokenFailure(const std::string& service,
-                                       const GoogleServiceAuthError& error)
-      OVERRIDE;
+  virtual void OnIssueAuthTokenFailure(
+      const std::string& service,
+      const GoogleServiceAuthError& error) OVERRIDE;
 
   // GaiaOAuthConsumer implementation.
   virtual void OnOAuthGetAccessTokenSuccess(const std::string& token,
@@ -175,18 +175,19 @@ class TokenService : public GaiaAuthConsumer,
   virtual void OnOAuthWrapBridgeSuccess(const std::string& service_scope,
                                         const std::string& token,
                                         const std::string& expires_in) OVERRIDE;
-  virtual void OnOAuthWrapBridgeFailure(const std::string& service_name,
-                                        const GoogleServiceAuthError& error)
-      OVERRIDE;
+  virtual void OnOAuthWrapBridgeFailure(
+      const std::string& service_name,
+      const GoogleServiceAuthError& error) OVERRIDE;
 
   // WebDataServiceConsumer implementation.
-  virtual void OnWebDataServiceRequestDone(WebDataService::Handle h,
-                                           const WDTypedResult* result);
+  virtual void OnWebDataServiceRequestDone(
+      WebDataService::Handle h,
+      const WDTypedResult* result) OVERRIDE;
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
  private:
 
diff --git a/chrome/browser/net/gaia/token_service_unittest.h b/chrome/browser/net/gaia/token_service_unittest.h
index 87fbee7..5095cb9 100644
--- a/chrome/browser/net/gaia/token_service_unittest.h
+++ b/chrome/browser/net/gaia/token_service_unittest.h
@@ -34,7 +34,7 @@ class TokenAvailableTracker : public TestNotificationTracker {
  private:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   TokenService::TokenAvailableDetails details_;
 };
@@ -51,7 +51,7 @@ class TokenFailedTracker : public TestNotificationTracker {
  private:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   TokenService::TokenRequestFailedDetails details_;
 };
@@ -61,9 +61,9 @@ class TokenServiceTestHarness : public testing::Test {
   TokenServiceTestHarness();
   virtual ~TokenServiceTestHarness();
 
-  virtual void SetUp();
+  virtual void SetUp() OVERRIDE;
 
-  virtual void TearDown();
+  virtual void TearDown() OVERRIDE;
 
   void WaitForDBLoadCompletion();
 
diff --git a/chrome/browser/net/http_server_properties_manager.h b/chrome/browser/net/http_server_properties_manager.h
index fa8e526..78c595e 100644
--- a/chrome/browser/net/http_server_properties_manager.h
+++ b/chrome/browser/net/http_server_properties_manager.h
@@ -173,7 +173,7 @@ class HttpServerPropertiesManager
   // Callback for preference changes.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // ---------
   // UI thread
diff --git a/chrome/browser/net/load_timing_observer.h b/chrome/browser/net/load_timing_observer.h
index 7f7f49e..444c3d4 100644
--- a/chrome/browser/net/load_timing_observer.h
+++ b/chrome/browser/net/load_timing_observer.h
@@ -69,7 +69,7 @@ class LoadTimingObserver : public ChromeNetLog::ThreadSafeObserverImpl {
                           const base::TimeTicks& time,
                           const net::NetLog::Source& source,
                           net::NetLog::EventPhase phase,
-                          net::NetLog::EventParameters* params);
+                          net::NetLog::EventParameters* params) OVERRIDE;
 
   static void PopulateTimingInfo(net::URLRequest* request,
                                  ResourceResponse* response);
diff --git a/chrome/browser/net/net_pref_observer.h b/chrome/browser/net/net_pref_observer.h
index b6da810..5c360a4 100644
--- a/chrome/browser/net/net_pref_observer.h
+++ b/chrome/browser/net/net_pref_observer.h
@@ -36,7 +36,7 @@ class NetPrefObserver : public content::NotificationObserver {
   // content::NotificationObserver
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   static void RegisterPrefs(PrefService* prefs);
 
diff --git a/chrome/browser/net/network_stats.h b/chrome/browser/net/network_stats.h
index 10af9a3..e241899 100644
--- a/chrome/browser/net/network_stats.h
+++ b/chrome/browser/net/network_stats.h
@@ -209,16 +209,16 @@ class UDPStatsClient : public NetworkStats {
   // Called after host is resolved. Creates UDClientSocket and connects to the
   // server. If successfully connected, then calls ConnectComplete() to start
   // the echo protocol. Returns |false| if there is any error.
-  virtual bool DoConnect(int result);
+  virtual bool DoConnect(int result) OVERRIDE;
 
   // This method calls NetworkStats::ReadComplete() to verify the data and calls
   // Finish() if there is an error or if read callback didn't return any data
   // (|result| is less than or equal to 0).
-  virtual bool ReadComplete(int result);
+  virtual bool ReadComplete(int result) OVERRIDE;
 
   // Collects stats for UDP connectivity. This is called when all the data from
   // server is read or when there is a failure during connect/read/write.
-  virtual void Finish(Status status, int result);
+  virtual void Finish(Status status, int result) OVERRIDE;
 };
 
 class TCPStatsClient : public NetworkStats {
@@ -234,15 +234,15 @@ class TCPStatsClient : public NetworkStats {
 
   // Called after host is resolved. Creates TCPClientSocket and connects to the
   // server.
-  virtual bool DoConnect(int result);
+  virtual bool DoConnect(int result) OVERRIDE;
 
   // This method calls NetworkStats::ReadComplete() to verify the data and calls
   // Finish() if there is an error (|result| is less than 0).
-  virtual bool ReadComplete(int result);
+  virtual bool ReadComplete(int result) OVERRIDE;
 
   // Collects stats for TCP connectivity. This is called when all the data from
   // server is read or when there is a failure during connect/read/write.
-  virtual void Finish(Status status, int result);
+  virtual void Finish(Status status, int result) OVERRIDE;
 
  private:
   // Callback that is called when connect is completed and calls
diff --git a/chrome/browser/net/passive_log_collector.h b/chrome/browser/net/passive_log_collector.h
index 63e2b18..7a720f3 100644
--- a/chrome/browser/net/passive_log_collector.h
+++ b/chrome/browser/net/passive_log_collector.h
@@ -93,9 +93,9 @@ class PassiveLogCollector : public ChromeNetLog::ThreadSafeObserverImpl {
     virtual ~GlobalSourceTracker();
 
     // SourceTrackerInterface implementation:
-    virtual void OnAddEntry(const ChromeNetLog::Entry& entry);
-    virtual void Clear();
-    virtual void AppendAllEntries(ChromeNetLog::EntryList* out) const;
+    virtual void OnAddEntry(const ChromeNetLog::Entry& entry) OVERRIDE;
+    virtual void Clear() OVERRIDE;
+    virtual void AppendAllEntries(ChromeNetLog::EntryList* out) const OVERRIDE;
 
    private:
     typedef std::deque<ChromeNetLog::Entry> CircularEntryList;
@@ -119,9 +119,9 @@ class PassiveLogCollector : public ChromeNetLog::ThreadSafeObserverImpl {
     virtual ~SourceTracker();
 
     // SourceTrackerInterface implementation:
-    virtual void OnAddEntry(const ChromeNetLog::Entry& entry);
-    virtual void Clear();
-    virtual void AppendAllEntries(ChromeNetLog::EntryList* out) const;
+    virtual void OnAddEntry(const ChromeNetLog::Entry& entry) OVERRIDE;
+    virtual void Clear() OVERRIDE;
+    virtual void AppendAllEntries(ChromeNetLog::EntryList* out) const OVERRIDE;
 
 #ifdef UNIT_TEST
     // Helper used to inspect the current state by unit-tests.
@@ -202,7 +202,7 @@ class PassiveLogCollector : public ChromeNetLog::ThreadSafeObserverImpl {
 
    private:
     virtual Action DoAddEntry(const ChromeNetLog::Entry& entry,
-                              SourceInfo* out_info);
+                              SourceInfo* out_info) OVERRIDE;
     DISALLOW_COPY_AND_ASSIGN(ConnectJobTracker);
   };
 
@@ -216,7 +216,7 @@ class PassiveLogCollector : public ChromeNetLog::ThreadSafeObserverImpl {
 
    private:
     virtual Action DoAddEntry(const ChromeNetLog::Entry& entry,
-                              SourceInfo* out_info);
+                              SourceInfo* out_info) OVERRIDE;
 
     DISALLOW_COPY_AND_ASSIGN(SocketTracker);
   };
@@ -231,7 +231,7 @@ class PassiveLogCollector : public ChromeNetLog::ThreadSafeObserverImpl {
 
    private:
     virtual Action DoAddEntry(const ChromeNetLog::Entry& entry,
-                              SourceInfo* out_info);
+                              SourceInfo* out_info) OVERRIDE;
 
     DISALLOW_COPY_AND_ASSIGN(RequestTracker);
   };
@@ -247,7 +247,7 @@ class PassiveLogCollector : public ChromeNetLog::ThreadSafeObserverImpl {
 
    private:
     virtual Action DoAddEntry(const ChromeNetLog::Entry& entry,
-                              SourceInfo* out_info);
+                              SourceInfo* out_info) OVERRIDE;
 
     DISALLOW_COPY_AND_ASSIGN(InitProxyResolverTracker);
   };
@@ -262,7 +262,7 @@ class PassiveLogCollector : public ChromeNetLog::ThreadSafeObserverImpl {
 
    private:
     virtual Action DoAddEntry(const ChromeNetLog::Entry& entry,
-                              SourceInfo* out_info);
+                              SourceInfo* out_info) OVERRIDE;
 
     DISALLOW_COPY_AND_ASSIGN(SpdySessionTracker);
   };
@@ -277,7 +277,7 @@ class PassiveLogCollector : public ChromeNetLog::ThreadSafeObserverImpl {
 
    private:
     virtual Action DoAddEntry(const ChromeNetLog::Entry& entry,
-                              SourceInfo* out_info);
+                              SourceInfo* out_info) OVERRIDE;
 
     DISALLOW_COPY_AND_ASSIGN(DNSRequestTracker);
   };
@@ -292,7 +292,7 @@ class PassiveLogCollector : public ChromeNetLog::ThreadSafeObserverImpl {
 
    private:
     virtual Action DoAddEntry(const ChromeNetLog::Entry& entry,
-                              SourceInfo* out_info);
+                              SourceInfo* out_info) OVERRIDE;
 
     DISALLOW_COPY_AND_ASSIGN(DNSJobTracker);
   };
@@ -307,7 +307,7 @@ class PassiveLogCollector : public ChromeNetLog::ThreadSafeObserverImpl {
 
    private:
     virtual Action DoAddEntry(const ChromeNetLog::Entry& entry,
-                              SourceInfo* out_info);
+                              SourceInfo* out_info) OVERRIDE;
 
     DISALLOW_COPY_AND_ASSIGN(DiskCacheEntryTracker);
   };
@@ -322,7 +322,7 @@ class PassiveLogCollector : public ChromeNetLog::ThreadSafeObserverImpl {
 
    protected:
     virtual Action DoAddEntry(const ChromeNetLog::Entry& entry,
-                              SourceInfo* out_info);
+                              SourceInfo* out_info) OVERRIDE;
 
    private:
     DISALLOW_COPY_AND_ASSIGN(MemCacheEntryTracker);
@@ -337,7 +337,7 @@ class PassiveLogCollector : public ChromeNetLog::ThreadSafeObserverImpl {
 
    private:
     virtual Action DoAddEntry(const ChromeNetLog::Entry& entry,
-                              SourceInfo* out_info);
+                              SourceInfo* out_info) OVERRIDE;
     DISALLOW_COPY_AND_ASSIGN(HttpStreamJobTracker);
   };
 
@@ -350,7 +350,7 @@ class PassiveLogCollector : public ChromeNetLog::ThreadSafeObserverImpl {
 
    private:
     virtual Action DoAddEntry(const ChromeNetLog::Entry& entry,
-                              SourceInfo* out_info);
+                              SourceInfo* out_info) OVERRIDE;
     DISALLOW_COPY_AND_ASSIGN(ExponentialBackoffThrottlingTracker);
   };
 
@@ -364,7 +364,7 @@ class PassiveLogCollector : public ChromeNetLog::ThreadSafeObserverImpl {
 
    private:
     virtual Action DoAddEntry(const ChromeNetLog::Entry& entry,
-                              SourceInfo* out_info);
+                              SourceInfo* out_info) OVERRIDE;
 
     DISALLOW_COPY_AND_ASSIGN(DnsTransactionTracker);
   };
@@ -379,7 +379,7 @@ class PassiveLogCollector : public ChromeNetLog::ThreadSafeObserverImpl {
 
    private:
     virtual Action DoAddEntry(const ChromeNetLog::Entry& entry,
-                              SourceInfo* out_info);
+                              SourceInfo* out_info) OVERRIDE;
 
     DISALLOW_COPY_AND_ASSIGN(AsyncHostResolverRequestTracker);
   };
@@ -395,7 +395,7 @@ class PassiveLogCollector : public ChromeNetLog::ThreadSafeObserverImpl {
 
    private:
     virtual Action DoAddEntry(const ChromeNetLog::Entry& entry,
-                              SourceInfo* out_info);
+                              SourceInfo* out_info) OVERRIDE;
 
     DISALLOW_COPY_AND_ASSIGN(UDPSocketTracker);
   };
@@ -410,7 +410,7 @@ class PassiveLogCollector : public ChromeNetLog::ThreadSafeObserverImpl {
 
    private:
     virtual Action DoAddEntry(const ChromeNetLog::Entry& entry,
-                              SourceInfo* out_info);
+                              SourceInfo* out_info) OVERRIDE;
 
     DISALLOW_COPY_AND_ASSIGN(CertVerifierJobTracker);
   };
@@ -423,7 +423,7 @@ class PassiveLogCollector : public ChromeNetLog::ThreadSafeObserverImpl {
                           const base::TimeTicks& time,
                           const net::NetLog::Source& source,
                           net::NetLog::EventPhase phase,
-                          net::NetLog::EventParameters* params);
+                          net::NetLog::EventParameters* params) OVERRIDE;
 
   // Clears all of the passively logged data.
   void Clear();
diff --git a/chrome/browser/net/predictor.h b/chrome/browser/net/predictor.h
index bb91587..2ec8dc0 100644
--- a/chrome/browser/net/predictor.h
+++ b/chrome/browser/net/predictor.h
@@ -505,8 +505,8 @@ class SimplePredictor : public Predictor {
   virtual ~SimplePredictor() {}
   virtual void InitNetworkPredictor(PrefService* user_prefs,
                                     PrefService* local_state,
-                                    IOThread* io_thread);
-  virtual void ShutdownOnUIThread(PrefService* user_prefs);
+                                    IOThread* io_thread) OVERRIDE;
+  virtual void ShutdownOnUIThread(PrefService* user_prefs) OVERRIDE;
 };
 
 }  // namespace chrome_browser_net
diff --git a/chrome/browser/net/pref_proxy_config_tracker_impl.h b/chrome/browser/net/pref_proxy_config_tracker_impl.h
index a96faf6..9868a5e 100644
--- a/chrome/browser/net/pref_proxy_config_tracker_impl.h
+++ b/chrome/browser/net/pref_proxy_config_tracker_impl.h
@@ -32,10 +32,13 @@ class ChromeProxyConfigService
   virtual ~ChromeProxyConfigService();
 
   // ProxyConfigService implementation:
-  virtual void AddObserver(net::ProxyConfigService::Observer* observer);
-  virtual void RemoveObserver(net::ProxyConfigService::Observer* observer);
-  virtual ConfigAvailability GetLatestProxyConfig(net::ProxyConfig* config);
-  virtual void OnLazyPoll();
+  virtual void AddObserver(
+      net::ProxyConfigService::Observer* observer) OVERRIDE;
+  virtual void RemoveObserver(
+      net::ProxyConfigService::Observer* observer) OVERRIDE;
+  virtual ConfigAvailability GetLatestProxyConfig(
+      net::ProxyConfig* config) OVERRIDE;
+  virtual void OnLazyPoll() OVERRIDE;
 
   // Method on IO thread that receives the preference proxy settings pushed from
   // PrefProxyConfigTrackerImpl.
@@ -45,7 +48,7 @@ class ChromeProxyConfigService
  private:
   // ProxyConfigService::Observer implementation:
   virtual void OnProxyConfigChanged(const net::ProxyConfig& config,
-                                    ConfigAvailability availability);
+                                    ConfigAvailability availability) OVERRIDE;
 
   // Makes sure that the observer registration with the base service is set up.
   void RegisterObserver();
@@ -121,7 +124,7 @@ class PrefProxyConfigTrackerImpl : public content::NotificationObserver {
   // content::NotificationObserver implementation:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // Converts a ProxyConfigDictionary to net::ProxyConfig representation.
   // Returns true if the data from in the dictionary is valid, false otherwise.
diff --git a/chrome/browser/net/sdch_dictionary_fetcher.h b/chrome/browser/net/sdch_dictionary_fetcher.h
index 0e7da26..d6cd795 100644
--- a/chrome/browser/net/sdch_dictionary_fetcher.h
+++ b/chrome/browser/net/sdch_dictionary_fetcher.h
@@ -32,7 +32,7 @@ class SdchDictionaryFetcher : public content::URLFetcherDelegate,
   // Implementation of SdchFetcher class.
   // This method gets the requested dictionary, and then calls back into the
   // SdchManager class with the dictionary's text.
-  virtual void Schedule(const GURL& dictionary_url);
+  virtual void Schedule(const GURL& dictionary_url) OVERRIDE;
 
  private:
   // Delay in ms between Schedule and actual download.
diff --git a/chrome/browser/notifications/balloon_collection_impl.h b/chrome/browser/notifications/balloon_collection_impl.h
index 424351c..9541219 100644
--- a/chrome/browser/notifications/balloon_collection_impl.h
+++ b/chrome/browser/notifications/balloon_collection_impl.h
@@ -46,16 +46,16 @@ class BalloonCollectionImpl : public BalloonCollection,
 
   // BalloonCollection interface.
   virtual void Add(const Notification& notification,
-                   Profile* profile);
-  virtual bool RemoveById(const std::string& id);
-  virtual bool RemoveBySourceOrigin(const GURL& source_origin);
-  virtual void RemoveAll();
-  virtual bool HasSpace() const;
-  virtual void ResizeBalloon(Balloon* balloon, const gfx::Size& size);
-  virtual void SetPositionPreference(PositionPreference position);
-  virtual void DisplayChanged();
-  virtual void OnBalloonClosed(Balloon* source);
-  virtual const Balloons& GetActiveBalloons();
+                   Profile* profile) OVERRIDE;
+  virtual bool RemoveById(const std::string& id) OVERRIDE;
+  virtual bool RemoveBySourceOrigin(const GURL& source_origin) OVERRIDE;
+  virtual void RemoveAll() OVERRIDE;
+  virtual bool HasSpace() const OVERRIDE;
+  virtual void ResizeBalloon(Balloon* balloon, const gfx::Size& size) OVERRIDE;
+  virtual void SetPositionPreference(PositionPreference position) OVERRIDE;
+  virtual void DisplayChanged() OVERRIDE;
+  virtual void OnBalloonClosed(Balloon* source) OVERRIDE;
+  virtual const Balloons& GetActiveBalloons() OVERRIDE;
 
   // content::NotificationObserver interface.
   virtual void Observe(int type,
diff --git a/chrome/browser/notifications/balloon_host.h b/chrome/browser/notifications/balloon_host.h
index 87c9418..bc52624 100644
--- a/chrome/browser/notifications/balloon_host.h
+++ b/chrome/browser/notifications/balloon_host.h
@@ -38,9 +38,9 @@ class BalloonHost : public TabContentsDelegate,
   void Shutdown();
 
   // ExtensionFunctionDispatcher::Delegate overrides.
-  virtual Browser* GetBrowser();
-  virtual gfx::NativeView GetNativeViewOfHost();
-  virtual TabContents* GetAssociatedTabContents() const;
+  virtual Browser* GetBrowser() OVERRIDE;
+  virtual gfx::NativeView GetNativeViewOfHost() OVERRIDE;
+  virtual TabContents* GetAssociatedTabContents() const OVERRIDE;
 
   const string16& GetSource() const;
 
diff --git a/chrome/browser/notifications/desktop_notification_service.h b/chrome/browser/notifications/desktop_notification_service.h
index 075e425..79c878b 100644
--- a/chrome/browser/notifications/desktop_notification_service.h
+++ b/chrome/browser/notifications/desktop_notification_service.h
@@ -79,7 +79,7 @@ class DesktopNotificationService : public content::NotificationObserver,
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // Creates a data:xxxx URL which contains the full HTML for a notification
   // using supplied icon, title, and text, run through a template which contains
diff --git a/chrome/browser/notifications/desktop_notifications_unittest.h b/chrome/browser/notifications/desktop_notifications_unittest.h
index 646511b..63123ae 100644
--- a/chrome/browser/notifications/desktop_notifications_unittest.h
+++ b/chrome/browser/notifications/desktop_notifications_unittest.h
@@ -38,13 +38,13 @@ class MockBalloonCollection : public BalloonCollectionImpl {
 
   // BalloonCollectionImpl overrides
   virtual void Add(const Notification& notification,
-                   Profile* profile);
-  virtual bool HasSpace() const;
+                   Profile* profile) OVERRIDE;
+  virtual bool HasSpace() const OVERRIDE;
   virtual Balloon* MakeBalloon(const Notification& notification,
-                               Profile* profile);
-  virtual void DisplayChanged() {}
-  virtual void OnBalloonClosed(Balloon* source);
-  virtual const BalloonCollection::Balloons& GetActiveBalloons();
+                               Profile* profile) OVERRIDE;
+  virtual void DisplayChanged() OVERRIDE {}
+  virtual void OnBalloonClosed(Balloon* source) OVERRIDE;
+  virtual const BalloonCollection::Balloons& GetActiveBalloons() OVERRIDE;
 
   // Number of balloons being shown.
   std::deque<Balloon*>& balloons() { return balloons_; }
@@ -79,8 +79,8 @@ class DesktopNotificationsTest : public testing::Test {
 
  protected:
   // testing::Test overrides
-  virtual void SetUp();
-  virtual void TearDown();
+  virtual void SetUp() OVERRIDE;
+  virtual void TearDown() OVERRIDE;
 
   void AllowOrigin(const GURL& origin) {
     service_->GrantPermission(origin);
diff --git a/chrome/browser/notifications/notification_object_proxy.h b/chrome/browser/notifications/notification_object_proxy.h
index efb0fc1..6373a11 100644
--- a/chrome/browser/notifications/notification_object_proxy.h
+++ b/chrome/browser/notifications/notification_object_proxy.h
@@ -22,11 +22,11 @@ class NotificationObjectProxy
                           int notification_id, bool worker);
 
   // NotificationDelegate implementation.
-  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;
 
  protected:
   friend class base::RefCountedThreadSafe<NotificationObjectProxy>;
diff --git a/chrome/browser/notifications/notification_options_menu_model.h b/chrome/browser/notifications/notification_options_menu_model.h
index 033f360..bbdefb96 100644
--- a/chrome/browser/notifications/notification_options_menu_model.h
+++ b/chrome/browser/notifications/notification_options_menu_model.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.
 
@@ -17,11 +17,12 @@ class CornerSelectionMenuModel : public ui::SimpleMenuModel,
   virtual ~CornerSelectionMenuModel();
 
   // Overridden from ui::SimpleMenuModel::Delegate:
-  virtual bool IsCommandIdChecked(int command_id) const;
-  virtual bool IsCommandIdEnabled(int command_id) const;
-  virtual bool GetAcceleratorForCommandId(int command_id,
-                                          ui::Accelerator* accelerator);
-  virtual void ExecuteCommand(int command_id);
+  virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
+  virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
+  virtual bool GetAcceleratorForCommandId(
+      int command_id,
+      ui::Accelerator* accelerator) OVERRIDE;
+  virtual void ExecuteCommand(int command_id) OVERRIDE;
 
  private:
   // Not owned.
@@ -38,15 +39,16 @@ class NotificationOptionsMenuModel : public ui::SimpleMenuModel,
   virtual ~NotificationOptionsMenuModel();
 
   // Overridden from ui::SimpleMenuModel:
-  virtual bool IsItemForCommandIdDynamic(int command_id) const;
-  virtual string16 GetLabelForCommandId(int command_id) const;
+  virtual bool IsItemForCommandIdDynamic(int command_id) const OVERRIDE;
+  virtual string16 GetLabelForCommandId(int command_id) const OVERRIDE;
 
   // Overridden from ui::SimpleMenuModel::Delegate:
-  virtual bool IsCommandIdChecked(int command_id) const;
-  virtual bool IsCommandIdEnabled(int command_id) const;
-  virtual bool GetAcceleratorForCommandId(int command_id,
-                                          ui::Accelerator* accelerator);
-  virtual void ExecuteCommand(int command_id);
+  virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
+  virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
+  virtual bool GetAcceleratorForCommandId(
+      int command_id,
+      ui::Accelerator* accelerator) OVERRIDE;
+  virtual void ExecuteCommand(int command_id) OVERRIDE;
 
  private:
   Balloon* balloon_; // Not owned.
diff --git a/chrome/browser/notifications/notification_test_util.h b/chrome/browser/notifications/notification_test_util.h
index 19b1fd7..9b6dd34 100644
--- a/chrome/browser/notifications/notification_test_util.h
+++ b/chrome/browser/notifications/notification_test_util.h
@@ -20,11 +20,11 @@ class MockNotificationDelegate : public NotificationDelegate {
   virtual ~MockNotificationDelegate();
 
   // NotificationDelegate interface.
-  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_;
@@ -79,12 +79,12 @@ class MockBalloonView : public BalloonView {
       balloon_(balloon) {}
 
   // BalloonView:
-  virtual void Show(Balloon* balloon) {}
-  virtual void Update() {}
-  virtual void RepositionToBalloon() {}
-  virtual void Close(bool by_user);
-  virtual gfx::Size GetSize() const;
-  virtual BalloonHost* GetHost() const;
+  virtual void Show(Balloon* balloon) OVERRIDE {}
+  virtual void Update() OVERRIDE {}
+  virtual void RepositionToBalloon() OVERRIDE {}
+  virtual void Close(bool by_user) OVERRIDE;
+  virtual gfx::Size GetSize() const OVERRIDE;
+  virtual BalloonHost* GetHost() const OVERRIDE;
 
  private:
   // Non-owned pointer.
diff --git a/chrome/browser/notifications/notification_ui_manager.h b/chrome/browser/notifications/notification_ui_manager.h
index 60605c4..9040595 100644
--- a/chrome/browser/notifications/notification_ui_manager.h
+++ b/chrome/browser/notifications/notification_ui_manager.h
@@ -90,7 +90,7 @@ class NotificationUIManager
   // content::NotificationObserver override.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
-                       const content::NotificationDetails& details);
+                       const content::NotificationDetails& details) OVERRIDE;
 
   // Attempts to display notifications from the show_queue if the user
   // is active.
@@ -100,7 +100,7 @@ class NotificationUIManager
   void ShowNotifications();
 
   // BalloonCollectionObserver implementation.
-  virtual void OnBalloonSpaceChanged();
+  virtual void OnBalloonSpaceChanged() OVERRIDE;
 
   // Replace an existing notification with this one if applicable;
   // returns true if the replacement happened.