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

Unified Diff: net/proxy/proxy_config_service_linux.cc

Issue 10914310: net: Fix clang warnings about missing virtual and OVERRIDE annotations. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 3 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/proxy/proxy_config_service_linux.cc
diff --git a/net/proxy/proxy_config_service_linux.cc b/net/proxy/proxy_config_service_linux.cc
index b323246156440fba6c8b6fbd5e55a23b613e964e..1c8e5a367d84f5de9c47ea42f7d72cde7c0f5a6a 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();
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698