Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(127)

Unified Diff: chrome/browser/extensions/api/tabs/tabs_api.h

Issue 624153002: replace OVERRIDE and FINAL with override and final in chrome/browser/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/api/tabs/tabs_api.h
diff --git a/chrome/browser/extensions/api/tabs/tabs_api.h b/chrome/browser/extensions/api/tabs/tabs_api.h
index 85d4e61a259b37b35cd9e4efce0b5f7fad8c4d4b..099ec20109f905e1a943f1ff934208a5f621a916 100644
--- a/chrome/browser/extensions/api/tabs/tabs_api.h
+++ b/chrome/browser/extensions/api/tabs/tabs_api.h
@@ -50,27 +50,27 @@ void ZoomModeToZoomSettings(ZoomController::ZoomMode zoom_mode,
// Windows
class WindowsGetFunction : public ChromeSyncExtensionFunction {
virtual ~WindowsGetFunction() {}
- virtual bool RunSync() OVERRIDE;
+ virtual bool RunSync() override;
DECLARE_EXTENSION_FUNCTION("windows.get", WINDOWS_GET)
};
class WindowsGetCurrentFunction : public ChromeSyncExtensionFunction {
virtual ~WindowsGetCurrentFunction() {}
- virtual bool RunSync() OVERRIDE;
+ virtual bool RunSync() override;
DECLARE_EXTENSION_FUNCTION("windows.getCurrent", WINDOWS_GETCURRENT)
};
class WindowsGetLastFocusedFunction : public ChromeSyncExtensionFunction {
virtual ~WindowsGetLastFocusedFunction() {}
- virtual bool RunSync() OVERRIDE;
+ virtual bool RunSync() override;
DECLARE_EXTENSION_FUNCTION("windows.getLastFocused", WINDOWS_GETLASTFOCUSED)
};
class WindowsGetAllFunction : public ChromeSyncExtensionFunction {
virtual ~WindowsGetAllFunction() {}
- virtual bool RunSync() OVERRIDE;
+ virtual bool RunSync() override;
DECLARE_EXTENSION_FUNCTION("windows.getAll", WINDOWS_GETALL)
};
class WindowsCreateFunction : public ChromeSyncExtensionFunction {
virtual ~WindowsCreateFunction() {}
- virtual bool RunSync() OVERRIDE;
+ virtual bool RunSync() override;
// Returns whether the window should be created in incognito mode.
// |create_data| are the options passed by the extension. It may be NULL.
// |urls| is the list of urls to open. If we are creating an incognito window,
@@ -86,54 +86,54 @@ class WindowsCreateFunction : public ChromeSyncExtensionFunction {
};
class WindowsUpdateFunction : public ChromeSyncExtensionFunction {
virtual ~WindowsUpdateFunction() {}
- virtual bool RunSync() OVERRIDE;
+ virtual bool RunSync() override;
DECLARE_EXTENSION_FUNCTION("windows.update", WINDOWS_UPDATE)
};
class WindowsRemoveFunction : public ChromeSyncExtensionFunction {
virtual ~WindowsRemoveFunction() {}
- virtual bool RunSync() OVERRIDE;
+ virtual bool RunSync() override;
DECLARE_EXTENSION_FUNCTION("windows.remove", WINDOWS_REMOVE)
};
// Tabs
class TabsGetFunction : public ChromeSyncExtensionFunction {
virtual ~TabsGetFunction() {}
- virtual bool RunSync() OVERRIDE;
+ virtual bool RunSync() override;
DECLARE_EXTENSION_FUNCTION("tabs.get", TABS_GET)
};
class TabsGetCurrentFunction : public ChromeSyncExtensionFunction {
virtual ~TabsGetCurrentFunction() {}
- virtual bool RunSync() OVERRIDE;
+ virtual bool RunSync() override;
DECLARE_EXTENSION_FUNCTION("tabs.getCurrent", TABS_GETCURRENT)
};
class TabsGetSelectedFunction : public ChromeSyncExtensionFunction {
virtual ~TabsGetSelectedFunction() {}
- virtual bool RunSync() OVERRIDE;
+ virtual bool RunSync() override;
DECLARE_EXTENSION_FUNCTION("tabs.getSelected", TABS_GETSELECTED)
};
class TabsGetAllInWindowFunction : public ChromeSyncExtensionFunction {
virtual ~TabsGetAllInWindowFunction() {}
- virtual bool RunSync() OVERRIDE;
+ virtual bool RunSync() override;
DECLARE_EXTENSION_FUNCTION("tabs.getAllInWindow", TABS_GETALLINWINDOW)
};
class TabsQueryFunction : public ChromeSyncExtensionFunction {
virtual ~TabsQueryFunction() {}
- virtual bool RunSync() OVERRIDE;
+ virtual bool RunSync() override;
DECLARE_EXTENSION_FUNCTION("tabs.query", TABS_QUERY)
};
class TabsCreateFunction : public ChromeSyncExtensionFunction {
virtual ~TabsCreateFunction() {}
- virtual bool RunSync() OVERRIDE;
+ virtual bool RunSync() override;
DECLARE_EXTENSION_FUNCTION("tabs.create", TABS_CREATE)
};
class TabsDuplicateFunction : public ChromeSyncExtensionFunction {
virtual ~TabsDuplicateFunction() {}
- virtual bool RunSync() OVERRIDE;
+ virtual bool RunSync() override;
DECLARE_EXTENSION_FUNCTION("tabs.duplicate", TABS_DUPLICATE)
};
class TabsHighlightFunction : public ChromeSyncExtensionFunction {
virtual ~TabsHighlightFunction() {}
- virtual bool RunSync() OVERRIDE;
+ virtual bool RunSync() override;
bool HighlightTab(TabStripModel* tabstrip,
ui::ListSelectionModel* selection,
int *active_index,
@@ -154,7 +154,7 @@ class TabsUpdateFunction : public ChromeAsyncExtensionFunction {
content::WebContents* web_contents_;
private:
- virtual bool RunAsync() OVERRIDE;
+ virtual bool RunAsync() override;
void OnExecuteCodeFinished(const std::string& error,
const GURL& on_url,
const base::ListValue& script_result);
@@ -163,7 +163,7 @@ class TabsUpdateFunction : public ChromeAsyncExtensionFunction {
};
class TabsMoveFunction : public ChromeSyncExtensionFunction {
virtual ~TabsMoveFunction() {}
- virtual bool RunSync() OVERRIDE;
+ virtual bool RunSync() override;
bool MoveTab(int tab_id,
int* new_index,
int iteration,
@@ -173,12 +173,12 @@ class TabsMoveFunction : public ChromeSyncExtensionFunction {
};
class TabsReloadFunction : public ChromeSyncExtensionFunction {
virtual ~TabsReloadFunction() {}
- virtual bool RunSync() OVERRIDE;
+ virtual bool RunSync() override;
DECLARE_EXTENSION_FUNCTION("tabs.reload", TABS_RELOAD)
};
class TabsRemoveFunction : public ChromeSyncExtensionFunction {
virtual ~TabsRemoveFunction() {}
- virtual bool RunSync() OVERRIDE;
+ virtual bool RunSync() override;
bool RemoveTab(int tab_id);
DECLARE_EXTENSION_FUNCTION("tabs.remove", TABS_REMOVE)
};
@@ -186,11 +186,11 @@ class TabsDetectLanguageFunction : public ChromeAsyncExtensionFunction,
public content::NotificationObserver {
private:
virtual ~TabsDetectLanguageFunction() {}
- virtual bool RunAsync() OVERRIDE;
+ virtual bool RunAsync() override;
virtual void Observe(int type,
const content::NotificationSource& source,
- const content::NotificationDetails& details) OVERRIDE;
+ const content::NotificationDetails& details) override;
void GotLanguage(const std::string& language);
content::NotificationRegistrar registrar_;
DECLARE_EXTENSION_FUNCTION("tabs.detectLanguage", TABS_DETECTLANGUAGE)
@@ -208,9 +208,9 @@ class TabsCaptureVisibleTabFunction
ChromeExtensionFunctionDetails chrome_details_;
// extensions::CaptureWebContentsFunction:
- virtual bool IsScreenshotEnabled() OVERRIDE;
- virtual content::WebContents* GetWebContentsForID(int id) OVERRIDE;
- virtual void OnCaptureFailure(FailureReason reason) OVERRIDE;
+ virtual bool IsScreenshotEnabled() override;
+ virtual content::WebContents* GetWebContentsForID(int id) override;
+ virtual void OnCaptureFailure(FailureReason reason) override;
DECLARE_EXTENSION_FUNCTION("tabs.captureVisibleTab", TABS_CAPTUREVISIBLETAB)
};
@@ -224,15 +224,15 @@ class ExecuteCodeInTabFunction : public ExecuteCodeFunction {
virtual ~ExecuteCodeInTabFunction();
// ExtensionFunction:
- virtual bool HasPermission() OVERRIDE;
+ virtual bool HasPermission() override;
// Initialize the |execute_tab_id_| and |details_| if they haven't already
// been. Returns whether initialization was successful.
- virtual bool Init() OVERRIDE;
- virtual bool CanExecuteScriptOnPage() OVERRIDE;
- virtual ScriptExecutor* GetScriptExecutor() OVERRIDE;
- virtual bool IsWebView() const OVERRIDE;
- virtual const GURL& GetWebViewSrc() const OVERRIDE;
+ virtual bool Init() override;
+ virtual bool CanExecuteScriptOnPage() override;
+ virtual ScriptExecutor* GetScriptExecutor() override;
+ virtual bool IsWebView() const override;
+ virtual const GURL& GetWebViewSrc() const override;
private:
const ChromeExtensionFunctionDetails chrome_details_;
@@ -243,7 +243,7 @@ class ExecuteCodeInTabFunction : public ExecuteCodeFunction {
class TabsExecuteScriptFunction : public ExecuteCodeInTabFunction {
protected:
- virtual bool ShouldInsertCSS() const OVERRIDE;
+ virtual bool ShouldInsertCSS() const override;
private:
virtual ~TabsExecuteScriptFunction() {}
@@ -251,7 +251,7 @@ class TabsExecuteScriptFunction : public ExecuteCodeInTabFunction {
virtual void OnExecuteCodeFinished(
const std::string& error,
const GURL& on_url,
- const base::ListValue& script_result) OVERRIDE;
+ const base::ListValue& script_result) override;
DECLARE_EXTENSION_FUNCTION("tabs.executeScript", TABS_EXECUTESCRIPT)
};
@@ -260,7 +260,7 @@ class TabsInsertCSSFunction : public ExecuteCodeInTabFunction {
private:
virtual ~TabsInsertCSSFunction() {}
- virtual bool ShouldInsertCSS() const OVERRIDE;
+ virtual bool ShouldInsertCSS() const override;
DECLARE_EXTENSION_FUNCTION("tabs.insertCSS", TABS_INSERTCSS)
};
@@ -282,7 +282,7 @@ class TabsSetZoomFunction : public ZoomAPIFunction {
private:
virtual ~TabsSetZoomFunction() {}
- virtual bool RunAsync() OVERRIDE;
+ virtual bool RunAsync() override;
DECLARE_EXTENSION_FUNCTION("tabs.setZoom", TABS_SETZOOM)
};
@@ -291,7 +291,7 @@ class TabsGetZoomFunction : public ZoomAPIFunction {
private:
virtual ~TabsGetZoomFunction() {}
- virtual bool RunAsync() OVERRIDE;
+ virtual bool RunAsync() override;
DECLARE_EXTENSION_FUNCTION("tabs.getZoom", TABS_GETZOOM)
};
@@ -300,7 +300,7 @@ class TabsSetZoomSettingsFunction : public ZoomAPIFunction {
private:
virtual ~TabsSetZoomSettingsFunction() {}
- virtual bool RunAsync() OVERRIDE;
+ virtual bool RunAsync() override;
DECLARE_EXTENSION_FUNCTION("tabs.setZoomSettings", TABS_SETZOOMSETTINGS)
};
@@ -309,7 +309,7 @@ class TabsGetZoomSettingsFunction : public ZoomAPIFunction {
private:
virtual ~TabsGetZoomSettingsFunction() {}
- virtual bool RunAsync() OVERRIDE;
+ virtual bool RunAsync() override;
DECLARE_EXTENSION_FUNCTION("tabs.getZoomSettings", TABS_GETZOOMSETTINGS)
};
« no previous file with comments | « chrome/browser/extensions/api/tabs/ash_panel_contents.cc ('k') | chrome/browser/extensions/api/tabs/tabs_event_router.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698