diff options
Diffstat (limited to 'chrome/browser/extensions/api/desktop_capture')
-rw-r--r-- | chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h | 6 | ||||
-rw-r--r-- | chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h b/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h index 475edf9..a1ff2a2 100644 --- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h +++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_api.h @@ -49,10 +49,10 @@ class DesktopCaptureChooseDesktopMediaFunction virtual ~DesktopCaptureChooseDesktopMediaFunction(); // ExtensionFunction overrides. - virtual bool RunAsync() OVERRIDE; + virtual bool RunAsync() override; // content::WebContentsObserver overrides. - virtual void WebContentsDestroyed() OVERRIDE; + virtual void WebContentsDestroyed() override; void OnPickerDialogResults(content::DesktopMediaID source); @@ -76,7 +76,7 @@ class DesktopCaptureCancelChooseDesktopMediaFunction virtual ~DesktopCaptureCancelChooseDesktopMediaFunction(); // ExtensionFunction overrides. - virtual bool RunSync() OVERRIDE; + virtual bool RunSync() override; }; class DesktopCaptureRequestsRegistry { diff --git a/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc b/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc index e2b9649..479c496 100644 --- a/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc +++ b/chrome/browser/extensions/api/desktop_capture/desktop_capture_apitest.cc @@ -53,7 +53,7 @@ class FakeDesktopMediaPicker : public DesktopMediaPicker { const base::string16& app_name, const base::string16& target_name, scoped_ptr<DesktopMediaList> model, - const DoneCallback& done_callback) OVERRIDE { + const DoneCallback& done_callback) override { if (!expectation_->cancelled) { // Post a task to call the callback asynchronously. base::ThreadTaskRunnerHandle::Get()->PostTask( @@ -95,7 +95,7 @@ class FakeDesktopMediaPickerFactory : // DesktopCaptureChooseDesktopMediaFunction::PickerFactory interface. virtual scoped_ptr<DesktopMediaList> CreateModel( bool show_screens, - bool show_windows) OVERRIDE { + bool show_windows) override { EXPECT_LE(current_test_, tests_count_); if (current_test_ >= tests_count_) return scoped_ptr<DesktopMediaList>(); @@ -104,7 +104,7 @@ class FakeDesktopMediaPickerFactory : return scoped_ptr<DesktopMediaList>(new FakeDesktopMediaList()); } - virtual scoped_ptr<DesktopMediaPicker> CreatePicker() OVERRIDE { + virtual scoped_ptr<DesktopMediaPicker> CreatePicker() override { EXPECT_LE(current_test_, tests_count_); if (current_test_ >= tests_count_) return scoped_ptr<DesktopMediaPicker>(); |