diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-17 03:15:21 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-17 03:15:21 +0000 |
| commit | 749bf5c2beff740af61c17f46ff979f763863ed5 (patch) | |
| tree | fcc85d6b0e698d83c8b81a5039f3437e05c19fdb /net/proxy | |
| parent | e056e5e937d0bfd685825f3b5f5ce22efda9b2e7 (diff) | |
| download | chromium_src-749bf5c2beff740af61c17f46ff979f763863ed5.zip chromium_src-749bf5c2beff740af61c17f46ff979f763863ed5.tar.gz chromium_src-749bf5c2beff740af61c17f46ff979f763863ed5.tar.bz2 | |
net: Fix clang warnings about missing virtual and OVERRIDE annotations.
BUG=115047
TBR=eroman@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10914310
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157070 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/proxy')
| -rw-r--r-- | net/proxy/proxy_config_service_linux.cc | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc index b323246..1c8e5a3 100644 --- a/net/proxy/proxy_config_service_linux.cc +++ b/net/proxy/proxy_config_service_linux.cc @@ -270,7 +270,7 @@ class SettingGetterImplGConf : public ProxyConfigServiceLinux::SettingGetter { return true; } - void ShutDown() { + virtual void ShutDown() OVERRIDE { if (client_) { DCHECK(task_runner_->BelongsToCurrentThread()); // We must explicitly disable gconf notifications here, because the gconf @@ -287,7 +287,8 @@ class SettingGetterImplGConf : public ProxyConfigServiceLinux::SettingGetter { } } - bool SetUpNotifications(ProxyConfigServiceLinux::Delegate* delegate) { + virtual bool SetUpNotifications( + ProxyConfigServiceLinux::Delegate* delegate) OVERRIDE { DCHECK(client_); DCHECK(task_runner_->BelongsToCurrentThread()); GError* error = NULL; @@ -596,7 +597,7 @@ class SettingGetterImplGSettings return true; } - void ShutDown() { + virtual void ShutDown() OVERRIDE { if (client_) { DCHECK(task_runner_->BelongsToCurrentThread()); // This also disables gsettings notifications. @@ -611,7 +612,8 @@ class SettingGetterImplGSettings } } - bool SetUpNotifications(ProxyConfigServiceLinux::Delegate* delegate) { + virtual bool SetUpNotifications( + ProxyConfigServiceLinux::Delegate* delegate) OVERRIDE { DCHECK(client_); DCHECK(task_runner_->BelongsToCurrentThread()); notify_delegate_ = delegate; @@ -1002,7 +1004,7 @@ class SettingGetterImplKDE : public ProxyConfigServiceLinux::SettingGetter, return true; } - void ShutDown() { + virtual void ShutDown() OVERRIDE { if (inotify_fd_ >= 0) { ResetCachedSettings(); inotify_watcher_.StopWatchingFileDescriptor(); @@ -1011,7 +1013,8 @@ class SettingGetterImplKDE : public ProxyConfigServiceLinux::SettingGetter, } } - bool SetUpNotifications(ProxyConfigServiceLinux::Delegate* delegate) { + virtual bool SetUpNotifications( + ProxyConfigServiceLinux::Delegate* delegate) OVERRIDE { DCHECK(inotify_fd_ >= 0); DCHECK(MessageLoop::current() == file_loop_); // We can't just watch the kioslaverc file directly, since KDE will write @@ -1036,12 +1039,12 @@ class SettingGetterImplKDE : public ProxyConfigServiceLinux::SettingGetter, } // Implement base::MessagePumpLibevent::Watcher. - void OnFileCanReadWithoutBlocking(int fd) { + virtual void OnFileCanReadWithoutBlocking(int fd) OVERRIDE { DCHECK_EQ(fd, inotify_fd_); DCHECK(MessageLoop::current() == file_loop_); OnChangeNotification(); } - void OnFileCanWriteWithoutBlocking(int fd) { + virtual void OnFileCanWriteWithoutBlocking(int fd) OVERRIDE { NOTREACHED(); } |