Skip to content

Commit

Permalink
Add a few missing overrides found by a new clang warning.
Browse files Browse the repository at this point in the history
Namely, -Winconsistent-missing-override. No behavior change.

BUG=428099
TBR=blundell

Review URL: https://codereview.chromium.org/652233006

Cr-Commit-Position: refs/heads/master@{#301761}
  • Loading branch information
nico authored and Commit bot committed Oct 29, 2014
1 parent e9c0d2e commit 7e7fce4
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 15 deletions.
2 changes: 1 addition & 1 deletion base/files/file_path_watcher_win.cc
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate,
virtual void WillDestroyCurrentMessageLoop() override;

// Callback from MessageLoopForIO.
virtual void OnObjectSignaled(HANDLE object);
virtual void OnObjectSignaled(HANDLE object) override;

private:
virtual ~FilePathWatcherImpl() {}
Expand Down
8 changes: 4 additions & 4 deletions base/win/enum_variant.h
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,10 @@ class BASE_EXPORT EnumVariant
// IEnumVARIANT.
STDMETHODIMP Next(ULONG requested_count,
VARIANT* out_elements,
ULONG* out_elements_received);
STDMETHODIMP Skip(ULONG skip_count);
STDMETHODIMP Reset();
STDMETHODIMP Clone(IEnumVARIANT** out_cloned_object);
ULONG* out_elements_received) override;
STDMETHODIMP Skip(ULONG skip_count) override;
STDMETHODIMP Reset() override;
STDMETHODIMP Clone(IEnumVARIANT** out_cloned_object) override;

private:
~EnumVariant();
Expand Down
2 changes: 1 addition & 1 deletion chrome/browser/profiles/profile.h
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ class Profile : public content::BrowserContext {
virtual PrefService* GetOffTheRecordPrefs() = 0;

// Returns the main request context.
virtual net::URLRequestContextGetter* GetRequestContext() = 0;
virtual net::URLRequestContextGetter* GetRequestContext() override = 0;

// Returns the request context used for extension-related requests. This
// is only used for a separate cookie store currently.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@ class ClientSideDetectionHostTest : public ChromeRenderViewHostTestHarness {
public:
typedef SafeBrowsingUIManager::UnsafeResource UnsafeResource;

virtual void SetUp() {
virtual void SetUp() override {
ChromeRenderViewHostTestHarness::SetUp();

// Inject service classes.
Expand All @@ -222,7 +222,7 @@ class ClientSideDetectionHostTest : public ChromeRenderViewHostTestHarness {
csd_host_->browse_info_.reset(new BrowseInfo);
}

virtual void TearDown() {
virtual void TearDown() override {
// Delete the host object on the UI thread and release the
// SafeBrowsingService.
BrowserThread::DeleteSoon(BrowserThread::UI, FROM_HERE,
Expand Down
2 changes: 1 addition & 1 deletion chrome/test/base/test_browser_window.h
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ class TestBrowserWindow : public BrowserWindow {
bool IsFullscreen() const override;
#if defined(OS_WIN)
virtual void SetMetroSnapMode(bool enable) override {}
virtual bool IsInMetroSnapMode() const;
virtual bool IsInMetroSnapMode() const override;
#endif
bool IsFullscreenBubbleVisible() const override;
LocationBar* GetLocationBar() const override;
Expand Down
6 changes: 3 additions & 3 deletions components/password_manager/core/browser/password_store.h
Original file line number Diff line number Diff line change
Expand Up @@ -214,11 +214,11 @@ class PasswordStore : protected PasswordStoreSync,
// base::Bind can't be used with them because it fails to cast PasswordStore
// to PasswordStoreSync.
virtual PasswordStoreChangeList AddLoginImpl(
const autofill::PasswordForm& form) = 0;
const autofill::PasswordForm& form) override = 0;
virtual PasswordStoreChangeList UpdateLoginImpl(
const autofill::PasswordForm& form) = 0;
const autofill::PasswordForm& form) override = 0;
virtual PasswordStoreChangeList RemoveLoginImpl(
const autofill::PasswordForm& form) = 0;
const autofill::PasswordForm& form) override = 0;

// Synchronous implementation to remove the given logins.
virtual PasswordStoreChangeList RemoveLoginsCreatedBetweenImpl(
Expand Down
3 changes: 1 addition & 2 deletions components/storage_monitor/test_volume_mount_watcher_win.h
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,6 @@ class TestVolumeMountWatcherWin : public VolumeMountWatcherWin {

void FlushWorkerPoolForTesting();

virtual void DeviceCheckComplete(const base::FilePath& device_path);

const std::vector<base::FilePath>& devices_checked() const {
return devices_checked_;
}
Expand All @@ -49,6 +47,7 @@ class TestVolumeMountWatcherWin : public VolumeMountWatcherWin {
void ReleaseDeviceCheck();

// VolumeMountWatcherWin:
virtual void DeviceCheckComplete(const base::FilePath& device_path) override;
virtual GetAttachedDevicesCallbackType
GetAttachedDevicesCallback() const override;
virtual GetDeviceDetailsCallbackType
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ class BrowserCldDataProvider : public IPC::Listener {
// OnCldDataRequest() and returns true. In all other cases, this method does
// nothing. This method is defined as virtual in order to force the
// implementation to define the specific IPC message(s) that it handles.
virtual bool OnMessageReceived(const IPC::Message&) = 0;
virtual bool OnMessageReceived(const IPC::Message&) override = 0;

// Called when the browser process receives an appropriate message in
// OnMessageReceived, above. The implementation should attempt to locate
Expand Down

0 comments on commit 7e7fce4

Please sign in to comment.