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

Unified Diff: chrome/browser/net/pref_proxy_config_service.cc

Issue 7327007: Moving notification types which are chrome specific to a new header file chrome_notification_type... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 5 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
Index: chrome/browser/net/pref_proxy_config_service.cc
===================================================================
--- chrome/browser/net/pref_proxy_config_service.cc (revision 91968)
+++ chrome/browser/net/pref_proxy_config_service.cc (working copy)
@@ -8,11 +8,11 @@
#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/prefs/pref_set_observer.h"
#include "chrome/browser/prefs/proxy_config_dictionary.h"
+#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/pref_names.h"
#include "content/browser/browser_thread.h"
#include "content/common/notification_details.h"
#include "content/common/notification_source.h"
-#include "content/common/notification_type.h"
PrefProxyConfigTracker::PrefProxyConfigTracker(PrefService* pref_service)
: pref_service_(pref_service) {
@@ -52,11 +52,11 @@
observers_.RemoveObserver(observer);
}
-void PrefProxyConfigTracker::Observe(NotificationType type,
+void PrefProxyConfigTracker::Observe(int type,
const NotificationSource& source,
const NotificationDetails& details) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- if (type == NotificationType::PREF_CHANGED &&
+ if (type == chrome::NOTIFICATION_PREF_CHANGED &&
Source<PrefService>(source).ptr() == pref_service_) {
net::ProxyConfig new_config;
ConfigState config_state = ReadPrefConfig(&new_config);
@@ -66,7 +66,7 @@
&PrefProxyConfigTracker::InstallProxyConfig,
new_config, config_state));
} else {
- NOTREACHED() << "Unexpected notification of type " << type.value;
+ NOTREACHED() << "Unexpected notification of type " << type;
}
}
« no previous file with comments | « chrome/browser/net/pref_proxy_config_service.h ('k') | chrome/browser/net/ssl_config_service_manager_pref.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698