summaryrefslogtreecommitdiffstats
path: root/chrome/browser/extensions/api/tab_capture
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/extensions/api/tab_capture')
-rw-r--r--chrome/browser/extensions/api/tab_capture/tab_capture_api.h4
-rw-r--r--chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc2
-rw-r--r--chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc4
-rw-r--r--chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc8
-rw-r--r--chrome/browser/extensions/api/tab_capture/tab_capture_registry.h4
5 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_api.h b/chrome/browser/extensions/api/tab_capture/tab_capture_api.h
index 23c163c..a13f1bb 100644
--- a/chrome/browser/extensions/api/tab_capture/tab_capture_api.h
+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_api.h
@@ -22,7 +22,7 @@ class TabCaptureCaptureFunction : public ChromeSyncExtensionFunction {
virtual ~TabCaptureCaptureFunction() {}
// ExtensionFunction:
- virtual bool RunSync() OVERRIDE;
+ virtual bool RunSync() override;
};
class TabCaptureGetCapturedTabsFunction : public ChromeSyncExtensionFunction {
@@ -34,7 +34,7 @@ class TabCaptureGetCapturedTabsFunction : public ChromeSyncExtensionFunction {
virtual ~TabCaptureGetCapturedTabsFunction() {}
// ExtensionFunction:
- virtual bool RunSync() OVERRIDE;
+ virtual bool RunSync() override;
};
} // namespace extensions
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
index 05d6439..4913d80 100644
--- a/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_apitest.cc
@@ -41,7 +41,7 @@ class TabCaptureApiTest : public ExtensionApiTest {
class TabCaptureApiPixelTest : public TabCaptureApiTest {
public:
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
EnablePixelOutput();
TabCaptureApiTest::SetUp();
}
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc
index 5e8c8fd..8efa51a 100644
--- a/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc
+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_performancetest.cc
@@ -98,12 +98,12 @@ class TabCapturePerformanceTest
return suffix;
}
- virtual void SetUp() OVERRIDE {
+ virtual void SetUp() override {
EnablePixelOutput();
ExtensionApiTest::SetUp();
}
- virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
+ virtual void SetUpCommandLine(CommandLine* command_line) override {
if (!ScalingMethod().empty()) {
command_line->AppendSwitchASCII(switches::kTabCaptureUpscaleQuality,
ScalingMethod());
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc
index 7e1a605..0ea0233 100644
--- a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc
+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.cc
@@ -96,25 +96,25 @@ class TabCaptureRegistry::LiveRequest : public content::WebContentsObserver {
}
protected:
- virtual void DidShowFullscreenWidget(int routing_id) OVERRIDE {
+ virtual void DidShowFullscreenWidget(int routing_id) override {
is_fullscreened_ = true;
if (capture_state_ == tab_capture::TAB_CAPTURE_STATE_ACTIVE)
registry_->DispatchStatusChangeEvent(this);
}
- virtual void DidDestroyFullscreenWidget(int routing_id) OVERRIDE {
+ virtual void DidDestroyFullscreenWidget(int routing_id) override {
is_fullscreened_ = false;
if (capture_state_ == tab_capture::TAB_CAPTURE_STATE_ACTIVE)
registry_->DispatchStatusChangeEvent(this);
}
- virtual void DidToggleFullscreenModeForTab(bool entered_fullscreen) OVERRIDE {
+ virtual void DidToggleFullscreenModeForTab(bool entered_fullscreen) override {
is_fullscreened_ = entered_fullscreen;
if (capture_state_ == tab_capture::TAB_CAPTURE_STATE_ACTIVE)
registry_->DispatchStatusChangeEvent(this);
}
- virtual void WebContentsDestroyed() OVERRIDE {
+ virtual void WebContentsDestroyed() override {
registry_->KillRequest(this); // Deletes |this|.
}
diff --git a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.h b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.h
index 49f7379..6ff320f 100644
--- a/chrome/browser/extensions/api/tab_capture/tab_capture_registry.h
+++ b/chrome/browser/extensions/api/tab_capture/tab_capture_registry.h
@@ -82,14 +82,14 @@ class TabCaptureRegistry : public BrowserContextKeyedAPI,
virtual void OnExtensionUnloaded(
content::BrowserContext* browser_context,
const Extension* extension,
- UnloadedExtensionInfo::Reason reason) OVERRIDE;
+ UnloadedExtensionInfo::Reason reason) override;
// MediaCaptureDevicesDispatcher::Observer implementation.
virtual void OnRequestUpdate(
int original_target_render_process_id,
int original_target_render_frame_id,
content::MediaStreamType stream_type,
- const content::MediaRequestState state) OVERRIDE;
+ const content::MediaRequestState state) override;
// Send a StatusChanged event containing the current state of |request|.
void DispatchStatusChangeEvent(const LiveRequest* request) const;