Commit b3257834 authored by avi@chromium.org's avatar avi@chromium.org

Add OVERRIDE to chrome/browser/ui/webui/.

BUG=104314
TEST=no change

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110920 0039d316-1c4b-4281-b951-d872f2087c98
parent 1cc91feb
......@@ -68,11 +68,11 @@ class ExtensionIconSource : public ChromeURLDataManager::DataSource,
// ChromeURLDataManager::DataSource
virtual std::string GetMimeType(const std::string&) const;
virtual std::string GetMimeType(const std::string&) const OVERRIDE;
virtual void StartDataRequest(const std::string& path,
bool is_incognito,
int request_id);
int request_id) OVERRIDE;
private:
// Encapsulates the request parameters for |request_id|.
......@@ -116,7 +116,7 @@ class ExtensionIconSource : public ChromeURLDataManager::DataSource,
// ImageLoadingTracker::Observer
virtual void OnImageLoaded(SkBitmap* image,
const ExtensionResource& resource,
int id);
int id) OVERRIDE;
// Called when the extension doesn't have an icon. We fall back to multiple
// sources, using the following order:
......
......@@ -35,11 +35,11 @@ class FaviconSource : public ChromeURLDataManager::DataSource {
// the path we registered.
virtual void StartDataRequest(const std::string& path,
bool is_incognito,
int request_id);
int request_id) OVERRIDE;
virtual std::string GetMimeType(const std::string&) const;
virtual std::string GetMimeType(const std::string&) const OVERRIDE;
virtual bool ShouldReplaceExistingSource() const;
virtual bool ShouldReplaceExistingSource() const OVERRIDE;
private:
// Called when favicon data is available from the history backend.
......
......@@ -27,9 +27,9 @@ class FileIconSource : public ChromeURLDataManager::DataSource {
// the path we registered.
virtual void StartDataRequest(const std::string& path,
bool is_incognito,
int request_id);
int request_id) OVERRIDE;
virtual std::string GetMimeType(const std::string&) const;
virtual std::string GetMimeType(const std::string&) const OVERRIDE;
// Called when favicon data is available from the history backend.
void OnFileIconDataAvailable(
......
......@@ -102,7 +102,7 @@ class HungRendererDialogHandler : public WebUIMessageHandler {
void CloseDialog();
// Overridden from WebUIMessageHandler
virtual void RegisterMessages();
virtual void RegisterMessages() OVERRIDE;
private:
void RequestTabContentsList(const base::ListValue* args);
......
......@@ -69,7 +69,7 @@ class InputWindowDialogHandler : public WebUIMessageHandler {
void CloseDialog();
// Overridden from WebUIMessageHandler
virtual void RegisterMessages();
virtual void RegisterMessages() OVERRIDE;
private:
void Validate(const base::ListValue* args);
......
......@@ -39,7 +39,7 @@ class MediaInternalsProxy
// content::NotificationObserver implementation.
virtual void Observe(int type,
const content::NotificationSource& source,
const content::NotificationDetails& details);
const content::NotificationDetails& details) OVERRIDE;
// Register a Handler and start receiving callbacks from MediaInternals.
void Attach(MediaInternalsMessageHandler* handler);
......@@ -51,7 +51,7 @@ class MediaInternalsProxy
void GetEverything();
// MediaInternalsObserver implementation. Called on the IO thread.
virtual void OnUpdate(const string16& update);
virtual void OnUpdate(const string16& update) OVERRIDE;
// ChromeNetLog::ThreadSafeObserver implementation. Callable from any thread:
virtual void OnAddEntry(net::NetLog::EventType type,
......
......@@ -20,7 +20,7 @@ class ForeignSessionHandler : public WebUIMessageHandler,
public content::NotificationObserver {
public:
// WebUIMessageHandler implementation.
virtual void RegisterMessages();
virtual void RegisterMessages() OVERRIDE;
ForeignSessionHandler();
virtual ~ForeignSessionHandler() {}
......
......@@ -63,7 +63,7 @@ class NewTabUI : public ChromeWebUI,
virtual std::string GetMimeType(const std::string&) const OVERRIDE;
virtual bool ShouldReplaceExistingSource() const;
virtual bool ShouldReplaceExistingSource() const OVERRIDE;
private:
virtual ~NewTabHTMLSource() {}
......@@ -79,7 +79,7 @@ class NewTabUI : public ChromeWebUI,
virtual void Observe(int type,
const content::NotificationSource& source,
const content::NotificationDetails& details);
const content::NotificationDetails& details) OVERRIDE;
// Reset the CSS caches.
void InitializeCSSCaches();
......
......@@ -27,8 +27,9 @@ class NTPResourceCacheFactory : public ProfileKeyedServiceFactory {
virtual ~NTPResourceCacheFactory();
// ProfileKeyedServiceFactory:
virtual ProfileKeyedService* BuildServiceInstanceFor(Profile* profile) const;
virtual bool ServiceRedirectedInIncognito();
virtual ProfileKeyedService* BuildServiceInstanceFor(
Profile* profile) const OVERRIDE;
virtual bool ServiceRedirectedInIncognito() OVERRIDE;
};
#endif // CHROME_BROWSER_UI_WEBUI_NTP_NTP_RESOURCE_CACHE_FACTORY_H_
......@@ -29,11 +29,12 @@ class ThumbnailSource : public ChromeURLDataManager::DataSource {
// the path we registered.
virtual void StartDataRequest(const std::string& path,
bool is_incognito,
int request_id);
int request_id) OVERRIDE;
virtual std::string GetMimeType(const std::string& path) const;
virtual std::string GetMimeType(const std::string& path) const OVERRIDE;
virtual MessageLoop* MessageLoopForRequestPath(const std::string& path) const;
virtual MessageLoop* MessageLoopForRequestPath(
const std::string& path) const OVERRIDE;
private:
virtual ~ThumbnailSource();
......
......@@ -27,23 +27,25 @@ class AdvancedOptionsHandler
virtual ~AdvancedOptionsHandler();
// OptionsPageUIHandler implementation.
virtual void GetLocalizedValues(DictionaryValue* localized_strings);
virtual void Initialize();
virtual void GetLocalizedValues(DictionaryValue* localized_strings) OVERRIDE;
virtual void Initialize() OVERRIDE;
// WebUIMessageHandler implementation.
virtual WebUIMessageHandler* Attach(WebUI* web_ui);
virtual void RegisterMessages();
virtual WebUIMessageHandler* Attach(WebUI* web_ui) OVERRIDE;
virtual void RegisterMessages() OVERRIDE;
// content::NotificationObserver implementation.
virtual void Observe(int type,
const content::NotificationSource& source,
const content::NotificationDetails& details);
const content::NotificationDetails& details) OVERRIDE;
// SelectFileDialog::Listener implementation
virtual void FileSelected(const FilePath& path, int index, void* params);
virtual void FileSelected(const FilePath& path,
int index,
void* params) OVERRIDE;
// CloudPrintSetupHandler::Delegate implementation.
virtual void OnCloudPrintSetupClosed();
virtual void OnCloudPrintSetupClosed() OVERRIDE;
private:
// Callback for the "selectDownloadLocation" message. This will prompt
......
......@@ -25,9 +25,10 @@ class AutofillOptionsHandler : public OptionsPageUIHandler,
virtual ~AutofillOptionsHandler();
// OptionsPageUIHandler implementation.
virtual void GetLocalizedValues(base::DictionaryValue* localized_strings);
virtual void Initialize();
virtual void RegisterMessages();
virtual void GetLocalizedValues(
base::DictionaryValue* localized_strings) OVERRIDE;
virtual void Initialize() OVERRIDE;
virtual void RegisterMessages() OVERRIDE;
// PersonalDataManagerObserver implementation.
virtual void OnPersonalDataChanged() OVERRIDE;
......
......@@ -30,7 +30,7 @@ class BrowserOptionsHandler : public OptionsPageUIHandler,
BrowserOptionsHandler();
virtual ~BrowserOptionsHandler();
virtual void Initialize();
virtual void Initialize() OVERRIDE;
// OptionsPageUIHandler implementation.
virtual void GetLocalizedValues(DictionaryValue* localized_strings) OVERRIDE;
......
......@@ -18,19 +18,19 @@ class ClearBrowserDataHandler : public OptionsPageUIHandler,
virtual ~ClearBrowserDataHandler();
// OptionsPageUIHandler implementation.
virtual void Initialize();
virtual void Initialize() OVERRIDE;
virtual void GetLocalizedValues(DictionaryValue* localized_strings);
virtual void GetLocalizedValues(DictionaryValue* localized_strings) OVERRIDE;
// WebUIMessageHandler implementation.
virtual void RegisterMessages();
virtual void RegisterMessages() OVERRIDE;
private:
// Javascript callback to start clearing data.
void HandleClearBrowserData(const ListValue* value);
// Callback from BrowsingDataRemover. Closes the dialog.
virtual void OnBrowsingDataRemoverDone();
virtual void OnBrowsingDataRemoverDone() OVERRIDE;
// If non-null it means removal is in progress. BrowsingDataRemover takes care
// of deleting itself when done.
......
......@@ -22,16 +22,16 @@ class ContentSettingsHandler : public OptionsPageUIHandler {
virtual ~ContentSettingsHandler();
// OptionsPageUIHandler implementation.
virtual void GetLocalizedValues(DictionaryValue* localized_strings);
virtual void GetLocalizedValues(DictionaryValue* localized_strings) OVERRIDE;
virtual void Initialize();
virtual void Initialize() OVERRIDE;
virtual void RegisterMessages();
virtual void RegisterMessages() OVERRIDE;
// content::NotificationObserver implementation.
virtual void Observe(int type,
const content::NotificationSource& source,
const content::NotificationDetails& details);
const content::NotificationDetails& details) OVERRIDE;
// Gets a string identifier for the group name, for use in HTML.
static std::string ContentSettingsTypeToGroupName(ContentSettingsType type);
......
......@@ -18,8 +18,9 @@ class CookiesViewHandler : public OptionsPageUIHandler,
virtual ~CookiesViewHandler();
// OptionsPageUIHandler implementation.
virtual void GetLocalizedValues(base::DictionaryValue* localized_strings);
virtual void RegisterMessages();
virtual void GetLocalizedValues(
base::DictionaryValue* localized_strings) OVERRIDE;
virtual void RegisterMessages() OVERRIDE;
// CookiesTreeModel::Observer implementation.
virtual void TreeNodesAdded(ui::TreeModel* model,
......
......@@ -23,18 +23,18 @@ class CoreOptionsHandler : public OptionsPageUIHandler {
virtual ~CoreOptionsHandler();
// OptionsPageUIHandler implementation.
virtual void Initialize();
virtual void GetLocalizedValues(DictionaryValue* localized_strings);
virtual void Uninitialize();
virtual void Initialize() OVERRIDE;
virtual void GetLocalizedValues(DictionaryValue* localized_strings) OVERRIDE;
virtual void Uninitialize() OVERRIDE;
// content::NotificationObserver implementation.
virtual void Observe(int type,
const content::NotificationSource& source,
const content::NotificationDetails& details);
const content::NotificationDetails& details) OVERRIDE;
// WebUIMessageHandler implementation.
virtual void RegisterMessages();
virtual WebUIMessageHandler* Attach(WebUI* web_ui);
virtual void RegisterMessages() OVERRIDE;
virtual WebUIMessageHandler* Attach(WebUI* web_ui) OVERRIDE;
void set_handlers_host(OptionsPageUIHandlerHost* handlers_host) {
handlers_host_ = handlers_host;
......
......@@ -17,17 +17,17 @@ class FontSettingsHandler : public OptionsPageUIHandler {
virtual ~FontSettingsHandler();
// OptionsPageUIHandler implementation.
virtual void GetLocalizedValues(DictionaryValue* localized_strings);
virtual void Initialize();
virtual void GetLocalizedValues(DictionaryValue* localized_strings) OVERRIDE;
virtual void Initialize() OVERRIDE;
// WebUIMessageHandler implementation.
virtual WebUIMessageHandler* Attach(WebUI* web_ui);
virtual void RegisterMessages();
virtual WebUIMessageHandler* Attach(WebUI* web_ui) OVERRIDE;
virtual void RegisterMessages() OVERRIDE;
// content::NotificationObserver implementation.
virtual void Observe(int type,
const content::NotificationSource& source,
const content::NotificationDetails& details);
const content::NotificationDetails& details) OVERRIDE;
private:
void HandleFetchFontsData(const ListValue* args);
......
......@@ -22,14 +22,15 @@ class HandlerOptionsHandler : public OptionsPageUIHandler {
virtual ~HandlerOptionsHandler();
// OptionsPageUIHandler implementation.
virtual void GetLocalizedValues(base::DictionaryValue* localized_strings);
virtual void Initialize();
virtual void RegisterMessages();
virtual void GetLocalizedValues(
base::DictionaryValue* localized_strings) OVERRIDE;
virtual void Initialize() OVERRIDE;
virtual void RegisterMessages() OVERRIDE;
// content::NotificationObserver implementation.
virtual void Observe(int type,
const content::NotificationSource& source,
const content::NotificationDetails& details);
const content::NotificationDetails& details) OVERRIDE;
private:
// Called when the user toggles whether custom handlers are enabled.
......
......@@ -26,11 +26,12 @@ class ImportDataHandler : public OptionsPageUIHandler,
virtual ~ImportDataHandler();
// OptionsPageUIHandler:
virtual void GetLocalizedValues(base::DictionaryValue* localized_strings);
virtual void Initialize();
virtual void GetLocalizedValues(
base::DictionaryValue* localized_strings) OVERRIDE;
virtual void Initialize() OVERRIDE;
// WebUIMessageHandler:
virtual void RegisterMessages();
virtual void RegisterMessages() OVERRIDE;
private:
void ImportData(const base::ListValue* args);
......
......@@ -16,10 +16,11 @@ class LanguageOptionsHandler : public LanguageOptionsHandlerCommon {
virtual ~LanguageOptionsHandler();
// OptionsPageUIHandler implementation.
virtual void GetLocalizedValues(base::DictionaryValue* localized_strings);
virtual void GetLocalizedValues(
base::DictionaryValue* localized_strings) OVERRIDE;
// WebUIMessageHandler implementation.
virtual void RegisterMessages();
virtual void RegisterMessages() OVERRIDE;
// The following static method is public for ease of testing.
......@@ -31,8 +32,8 @@ class LanguageOptionsHandler : public LanguageOptionsHandlerCommon {
private:
// LanguageOptionsHandlerCommon implementation.
virtual string16 GetProductName();
virtual void SetApplicationLocale(const std::string& language_code);
virtual string16 GetProductName() OVERRIDE;
virtual void SetApplicationLocale(const std::string& language_code) OVERRIDE;
// Called when the restart button is clicked.
void RestartCallback(const base::ListValue* args);
......
......@@ -21,10 +21,11 @@ class LanguageOptionsHandlerCommon : public OptionsPageUIHandler {
virtual ~LanguageOptionsHandlerCommon();
// OptionsPageUIHandler implementation.
virtual void GetLocalizedValues(base::DictionaryValue* localized_strings);
virtual void GetLocalizedValues(
base::DictionaryValue* localized_strings) OVERRIDE;
// DOMMessageHandler implementation.
virtual void RegisterMessages();
virtual void RegisterMessages() OVERRIDE;
// The following static methods are public for ease of testing.
......
......@@ -15,16 +15,17 @@ class ManageProfileHandler : public OptionsPageUIHandler {
virtual ~ManageProfileHandler();
// OptionsPageUIHandler:
virtual void GetLocalizedValues(base::DictionaryValue* localized_strings);
virtual void Initialize();
virtual void GetLocalizedValues(
base::DictionaryValue* localized_strings) OVERRIDE;
virtual void Initialize() OVERRIDE;
// WebUIMessageHandler:
virtual void RegisterMessages();
virtual void RegisterMessages() OVERRIDE;
// content::NotificationObserver:
virtual void Observe(int type,
const content::NotificationSource& source,
const content::NotificationDetails& details);
const content::NotificationDetails& details) OVERRIDE;
private:
// Callback for the "requestDefaultProfileIcons" message.
......
......@@ -15,7 +15,7 @@ class OptionsSyncSetupHandler : public SyncSetupHandler {
virtual ~OptionsSyncSetupHandler();
protected:
virtual void ShowSetupUI();
virtual void ShowSetupUI() OVERRIDE;
};
#endif // CHROME_BROWSER_UI_WEBUI_OPTIONS_OPTIONS_SYNC_SETUP_HANDLER_H_
......@@ -21,17 +21,17 @@ class PasswordManagerHandler : public OptionsPageUIHandler,
virtual ~PasswordManagerHandler();
// OptionsPageUIHandler implementation.
virtual void GetLocalizedValues(DictionaryValue* localized_strings);
virtual void Initialize();
virtual void RegisterMessages();
virtual void GetLocalizedValues(DictionaryValue* localized_strings) OVERRIDE;
virtual void Initialize() OVERRIDE;
virtual void RegisterMessages() OVERRIDE;
// PasswordStore::Observer implementation.
virtual void OnLoginsChanged();
virtual void OnLoginsChanged() OVERRIDE;
// content::NotificationObserver implementation.
virtual void Observe(int type,
const content::NotificationSource& source,
const content::NotificationDetails& details);
const content::NotificationDetails& details) OVERRIDE;
private:
// The password store associated with the currently active profile.
......@@ -88,12 +88,12 @@ class PasswordManagerHandler : public OptionsPageUIHandler,
explicit PasswordListPopulater(PasswordManagerHandler* page);
// Send a query to the password store to populate a password list.
virtual void Populate();
virtual void Populate() OVERRIDE;
// Send the password store's reply back to the handler.
virtual void OnPasswordStoreRequestDone(
CancelableRequestProvider::Handle handle,
const std::vector<webkit_glue::PasswordForm*>& result);
const std::vector<webkit_glue::PasswordForm*>& result) OVERRIDE;
};
// A short class to mediate requests to the password store for exceptions.
......@@ -102,12 +102,12 @@ class PasswordManagerHandler : public OptionsPageUIHandler,
explicit PasswordExceptionListPopulater(PasswordManagerHandler* page);
// Send a query to the password store to populate a passwordException list.
virtual void Populate();
virtual void Populate() OVERRIDE;
// Send the password store's reply back to the handler.
virtual void OnPasswordStoreRequestDone(
CancelableRequestProvider::Handle handle,
const std::vector<webkit_glue::PasswordForm*>& result);
const std::vector<webkit_glue::PasswordForm*>& result) OVERRIDE;
};
// Password store consumer for populating the password list and exceptions.
......
......@@ -21,19 +21,19 @@ class PersonalOptionsHandler : public OptionsPageUIHandler,
virtual ~PersonalOptionsHandler();
// OptionsPageUIHandler implementation.
virtual void GetLocalizedValues(DictionaryValue* localized_strings);
virtual void Initialize();
virtual void GetLocalizedValues(DictionaryValue* localized_strings) OVERRIDE;
virtual void Initialize() OVERRIDE;
// WebUIMessageHandler implementation.
virtual void RegisterMessages();
virtual void RegisterMessages() OVERRIDE;
// content::NotificationObserver implementation.
virtual void Observe(int type,
const content::NotificationSource& source,
const content::NotificationDetails& details);
const content::NotificationDetails& details) OVERRIDE;
// ProfileSyncServiceObserver implementation.
virtual void OnStateChanged();
virtual void OnStateChanged() OVERRIDE;
private:
void ObserveThemeChanged();
......
......@@ -19,24 +19,25 @@ class SearchEngineManagerHandler : public OptionsPageUIHandler,
SearchEngineManagerHandler();
virtual ~SearchEngineManagerHandler();
virtual void Initialize();
virtual void Initialize() OVERRIDE;
// OptionsPageUIHandler implementation.
virtual void GetLocalizedValues(base::DictionaryValue* localized_strings);
virtual void GetLocalizedValues(
base::DictionaryValue* localized_strings) OVERRIDE;
// ui::TableModelObserver implementation.
virtual void OnModelChanged();
virtual void OnItemsChanged(int start, int length);
virtual void OnItemsAdded(int start, int length);
virtual void OnItemsRemoved(int start, int length);
virtual void OnModelChanged() OVERRIDE;
virtual void OnItemsChanged(int start, int length) OVERRIDE;
virtual void OnItemsAdded(int start, int length) OVERRIDE;
virtual void OnItemsRemoved(int start, int length) OVERRIDE;
// EditSearchEngineControllerDelegate implementation.
virtual void OnEditedKeyword(const TemplateURL* template_url,
const string16& title,
const string16& keyword,
const std::string& url);
const std::string& url) OVERRIDE;
virtual void RegisterMessages();
virtual void RegisterMessages() OVERRIDE;
private:
scoped_ptr<KeywordEditorController> list_controller_;
......
......@@ -14,10 +14,11 @@ class StopSyncingHandler : public OptionsPageUIHandler {
virtual ~StopSyncingHandler();
// OptionsPageUIHandler implementation.
virtual void GetLocalizedValues(base::DictionaryValue* localized_strings);
virtual void GetLocalizedValues(
base::DictionaryValue* localized_strings) OVERRIDE;
// WebUIMessageHandler implementation.
virtual void RegisterMessages();
virtual void RegisterMessages() OVERRIDE;
private:
void StopSyncing(const base::ListValue* args);
......
......@@ -21,8 +21,9 @@ class WebIntentsSettingsHandler : public OptionsPageUIHandler,
virtual ~WebIntentsSettingsHandler();
// OptionsPageUIHandler implementation.
virtual void GetLocalizedValues(base::DictionaryValue* localized_strings);
virtual void RegisterMessages();
virtual void GetLocalizedValues(
base::DictionaryValue* localized_strings) OVERRIDE;
virtual void RegisterMessages() OVERRIDE;
// WebIntentsModel::Observer implementation.
virtual void TreeNodesAdded(ui::TreeModel* model,
......
......@@ -27,9 +27,9 @@ class ScreenshotSource : public ChromeURLDataManager::DataSource {
// the path we registered.
virtual void StartDataRequest(const std::string& path,
bool is_incognito,
int request_id);
int request_id) OVERRIDE;
virtual std::string GetMimeType(const std::string&) const;
virtual std::string GetMimeType(const std::string&) const OVERRIDE;
// Get the screenshot specified by the given relative path that we've cached
// from a previous request to the screenshots source.
......
......@@ -8,6 +8,7 @@
#include <string>
#include "base/compiler_specific.h"
#include "chrome/browser/ui/webui/chrome_url_data_manager.h"
// A DataSource for chrome://resources/ URLs.
......@@ -18,8 +19,8 @@ class SharedResourcesDataSource : public ChromeURLDataManager::DataSource {
// Overridden from ChromeURLDataManager::DataSource:
virtual void StartDataRequest(const std::string& path,
bool is_incognito,
int request_id);
virtual std::string GetMimeType(const std::string&) const;
int request_id) OVERRIDE;
virtual std::string GetMimeType(const std::string&) const OVERRIDE;
private:
virtual ~SharedResourcesDataSource();
......
......@@ -21,13 +21,14 @@ class ThemeSource : public ChromeURLDataManager::DataSource {
// the path we registered.
virtual void StartDataRequest(const std::string& path,
bool is_incognito,
int request_id);
virtual std::string GetMimeType(const std::string& path) const;
int request_id) OVERRIDE;
virtual std::string GetMimeType(const std::string& path) const OVERRIDE;
// Used to tell ChromeURLDataManager which thread to handle the request on.
virtual MessageLoop* MessageLoopForRequestPath(const std::string& path) const;
virtual MessageLoop* MessageLoopForRequestPath(
const std::string& path) const OVERRIDE;
virtual bool ShouldReplaceExistingSource() const;
virtual bool ShouldReplaceExistingSource() const OVERRIDE;
protected:
virtual ~ThemeSource();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment