summaryrefslogtreecommitdiffstats
path: root/chrome/browser/net
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/net')
-rw-r--r--chrome/browser/net/chrome_url_request_context.cc10
-rw-r--r--chrome/browser/net/chrome_url_request_context.h12
-rw-r--r--chrome/browser/net/gaia/gaia_oauth_fetcher.cc20
-rw-r--r--chrome/browser/net/gaia/gaia_oauth_fetcher.h14
-rw-r--r--chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc4
-rw-r--r--chrome/browser/net/gaia/token_service.cc20
-rw-r--r--chrome/browser/net/gaia/token_service.h14
-rw-r--r--chrome/browser/net/gaia/token_service_unittest.cc20
-rw-r--r--chrome/browser/net/gaia/token_service_unittest.h12
-rw-r--r--chrome/browser/net/http_server_properties_manager.cc15
-rw-r--r--chrome/browser/net/http_server_properties_manager.h10
-rw-r--r--chrome/browser/net/net_pref_observer.cc8
-rw-r--r--chrome/browser/net/net_pref_observer.h10
-rw-r--r--chrome/browser/net/pref_proxy_config_service.cc13
-rw-r--r--chrome/browser/net/pref_proxy_config_service.h10
-rw-r--r--chrome/browser/net/ssl_config_service_manager_pref.cc21
16 files changed, 108 insertions, 105 deletions
diff --git a/chrome/browser/net/chrome_url_request_context.cc b/chrome/browser/net/chrome_url_request_context.cc
index 5124580..78ca969 100644
--- a/chrome/browser/net/chrome_url_request_context.cc
+++ b/chrome/browser/net/chrome_url_request_context.cc
@@ -256,16 +256,16 @@ void ChromeURLRequestContextGetter::CleanupOnUIThread() {
registrar_.RemoveAll();
}
-// NotificationObserver implementation.
+// content::NotificationObserver implementation.
void ChromeURLRequestContextGetter::Observe(
int type,
- const NotificationSource& source,
- const NotificationDetails& details) {
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
if (chrome::NOTIFICATION_PREF_CHANGED == type) {
- std::string* pref_name_in = Details<std::string>(details).ptr();
- PrefService* prefs = Source<PrefService>(source).ptr();
+ std::string* pref_name_in = content::Details<std::string>(details).ptr();
+ PrefService* prefs = content::Source<PrefService>(source).ptr();
DCHECK(pref_name_in && prefs);
if (*pref_name_in == prefs::kAcceptLanguages) {
std::string accept_language =
diff --git a/chrome/browser/net/chrome_url_request_context.h b/chrome/browser/net/chrome_url_request_context.h
index b8d5a16..aa469f5 100644
--- a/chrome/browser/net/chrome_url_request_context.h
+++ b/chrome/browser/net/chrome_url_request_context.h
@@ -11,8 +11,8 @@
#include "base/memory/scoped_ptr.h"
#include "chrome/browser/prefs/pref_change_registrar.h"
-#include "content/common/notification_observer.h"
-#include "content/common/notification_registrar.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"
@@ -90,7 +90,7 @@ class ChromeURLRequestContext : public net::URLRequestContext {
// Most methods are expected to be called on the UI thread, except for
// the destructor and GetURLRequestContext().
class ChromeURLRequestContextGetter : public net::URLRequestContextGetter,
- public NotificationObserver {
+ public content::NotificationObserver {
public:
// Constructs a ChromeURLRequestContextGetter that will use |factory| to
// create the ChromeURLRequestContext. If |profile| is non-NULL, then the
@@ -159,10 +159,10 @@ class ChromeURLRequestContextGetter : public net::URLRequestContextGetter,
// thread before the instance is deleted on the IO thread.
void CleanupOnUIThread();
- // NotificationObserver implementation.
+ // content::NotificationObserver implementation.
virtual void Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details);
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details);
private:
// Must be called on the IO thread.
diff --git a/chrome/browser/net/gaia/gaia_oauth_fetcher.cc b/chrome/browser/net/gaia/gaia_oauth_fetcher.cc
index 1ab44ce..828ca7f 100644
--- a/chrome/browser/net/gaia/gaia_oauth_fetcher.cc
+++ b/chrome/browser/net/gaia/gaia_oauth_fetcher.cc
@@ -22,8 +22,8 @@
#include "chrome/common/net/gaia/google_service_auth_error.h"
#include "chrome/common/net/gaia/oauth_request_signer.h"
#include "chrome/common/net/http_return.h"
-#include "content/common/notification_details.h"
-#include "content/common/notification_source.h"
+#include "content/public/browser/notification_details.h"
+#include "content/public/browser/notification_source.h"
#include "grit/chromium_strings.h"
#include "net/base/load_flags.h"
#include "net/url_request/url_request_context_getter.h"
@@ -309,7 +309,7 @@ void GaiaOAuthFetcher::StartGetOAuthToken() {
fetch_pending_ = true;
registrar_.Add(this,
chrome::NOTIFICATION_COOKIE_CHANGED,
- Source<Profile>(profile_));
+ content::Source<Profile>(profile_));
Browser* browser = BrowserList::GetLastActiveWithProfile(profile_);
DCHECK(browser);
@@ -324,7 +324,7 @@ void GaiaOAuthFetcher::StartGetOAuthToken() {
DCHECK(popup_ && popup_ != browser);
registrar_.Add(this,
chrome::NOTIFICATION_BROWSER_CLOSING,
- Source<Browser>(popup_));
+ content::Source<Browser>(popup_));
}
void GaiaOAuthFetcher::StartOAuthLogin(
@@ -481,17 +481,17 @@ GoogleServiceAuthError GaiaOAuthFetcher::GenerateAuthError(
}
void GaiaOAuthFetcher::Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details) {
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) {
switch (type) {
case chrome::NOTIFICATION_COOKIE_CHANGED: {
- OnCookieChanged(Source<Profile>(source).ptr(),
- Details<ChromeCookieDetails>(details).ptr());
+ OnCookieChanged(content::Source<Profile>(source).ptr(),
+ content::Details<ChromeCookieDetails>(details).ptr());
break;
}
case chrome::NOTIFICATION_BROWSER_CLOSING: {
- OnBrowserClosing(Source<Browser>(source).ptr(),
- *(Details<bool>(details)).ptr());
+ OnBrowserClosing(content::Source<Browser>(source).ptr(),
+ *(content::Details<bool>(details)).ptr());
break;
}
default: {
diff --git a/chrome/browser/net/gaia/gaia_oauth_fetcher.h b/chrome/browser/net/gaia/gaia_oauth_fetcher.h
index c77f670..77830b2 100644
--- a/chrome/browser/net/gaia/gaia_oauth_fetcher.h
+++ b/chrome/browser/net/gaia/gaia_oauth_fetcher.h
@@ -12,8 +12,8 @@
#include "chrome/browser/net/chrome_cookie_notification_details.h"
#include "chrome/browser/net/gaia/gaia_oauth_consumer.h"
#include "content/common/net/url_fetcher.h"
-#include "content/common/notification_observer.h"
-#include "content/common/notification_registrar.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
#include "googleurl/src/gurl.h"
struct ChromeCookieDetails;
@@ -39,7 +39,7 @@ class Profile;
// This class can handle one request at a time, and all calls through an
// instance should be serialized.
class GaiaOAuthFetcher : public URLFetcher::Delegate,
- public NotificationObserver {
+ public content::NotificationObserver {
public:
// Defines steps of OAuth process performed by this class.
typedef enum {
@@ -115,10 +115,10 @@ class GaiaOAuthFetcher : public URLFetcher::Delegate,
// StartOAuthWrapBridge).
virtual void StartOAuthRevokeWrapToken(const std::string& token);
- // NotificationObserver implementation.
+ // content::NotificationObserver implementation.
virtual void Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details) OVERRIDE;
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) OVERRIDE;
// Called when a cookie, e. g. oauth_token, changes
virtual void OnCookieChanged(Profile* profile,
@@ -243,7 +243,7 @@ class GaiaOAuthFetcher : public URLFetcher::Delegate,
net::URLRequestContextGetter* const getter_;
Profile* profile_;
Browser* popup_;
- NotificationRegistrar registrar_;
+ content::NotificationRegistrar registrar_;
// While a fetch is going on:
scoped_ptr<URLFetcher> fetcher_;
diff --git a/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc b/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc
index 259e788..48f160c 100644
--- a/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc
+++ b/chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc
@@ -125,8 +125,8 @@ TEST(GaiaOAuthFetcherTest, GetOAuthToken) {
oauth_fetcher.Observe(
chrome::NOTIFICATION_COOKIE_CHANGED,
- Source<Profile>(&profile),
- Details<ChromeCookieDetails>(cookie_details.get()));
+ content::Source<Profile>(&profile),
+ content::Details<ChromeCookieDetails>(cookie_details.get()));
}
#endif // 0 // Suppressing for now
diff --git a/chrome/browser/net/gaia/token_service.cc b/chrome/browser/net/gaia/token_service.cc
index 0ad60c9..6e546d3 100644
--- a/chrome/browser/net/gaia/token_service.cc
+++ b/chrome/browser/net/gaia/token_service.cc
@@ -13,7 +13,7 @@
#include "chrome/common/net/gaia/gaia_constants.h"
#include "content/browser/browser_thread.h"
#include "content/common/notification_service.h"
-#include "content/common/notification_source.h"
+#include "content/public/browser/notification_source.h"
#include "net/url_request/url_request_context_getter.h"
// Unfortunately kNumServices must be defined in the .h.
@@ -81,7 +81,7 @@ void TokenService::Initialize(const char* const source,
registrar_.Add(this,
chrome::NOTIFICATION_TOKEN_UPDATED,
- Source<Profile>(profile));
+ content::Source<Profile>(profile));
}
void TokenService::ResetCredentialsInMemory() {
@@ -230,8 +230,8 @@ void TokenService::FireTokenAvailableNotification(
TokenAvailableDetails details(service, auth_token);
NotificationService::current()->Notify(
chrome::NOTIFICATION_TOKEN_AVAILABLE,
- Source<TokenService>(this),
- Details<const TokenAvailableDetails>(&details));
+ content::Source<TokenService>(this),
+ content::Details<const TokenAvailableDetails>(&details));
}
void TokenService::FireTokenRequestFailedNotification(
@@ -241,8 +241,8 @@ void TokenService::FireTokenRequestFailedNotification(
TokenRequestFailedDetails details(service, error);
NotificationService::current()->Notify(
chrome::NOTIFICATION_TOKEN_REQUEST_FAILED,
- Source<TokenService>(this),
- Details<const TokenRequestFailedDetails>(&details));
+ content::Source<TokenService>(this),
+ content::Details<const TokenRequestFailedDetails>(&details));
}
void TokenService::IssueAuthTokenForTest(const std::string& service,
@@ -317,7 +317,7 @@ void TokenService::OnWebDataServiceRequestDone(WebDataService::Handle h,
NotificationService::current()->Notify(
chrome::NOTIFICATION_TOKEN_LOADING_FINISHED,
- Source<TokenService>(this),
+ content::Source<TokenService>(this),
NotificationService::NoDetails());
}
@@ -408,10 +408,10 @@ void TokenService::LoadTokensIntoMemory(
}
void TokenService::Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details) {
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) {
DCHECK_EQ(type, chrome::NOTIFICATION_TOKEN_UPDATED);
TokenAvailableDetails* tok_details =
- Details<TokenAvailableDetails>(details).ptr();
+ content::Details<TokenAvailableDetails>(details).ptr();
OnIssueAuthTokenSuccess(tok_details->service(), tok_details->token());
}
diff --git a/chrome/browser/net/gaia/token_service.h b/chrome/browser/net/gaia/token_service.h
index 39967ad..f7662e5 100644
--- a/chrome/browser/net/gaia/token_service.h
+++ b/chrome/browser/net/gaia/token_service.h
@@ -47,8 +47,8 @@
#include "chrome/common/net/gaia/gaia_auth_consumer.h"
#include "chrome/common/net/gaia/gaia_auth_fetcher.h"
#include "chrome/common/net/gaia/google_service_auth_error.h"
-#include "content/common/notification_observer.h"
-#include "content/common/notification_registrar.h"
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
class Profile;
@@ -61,7 +61,7 @@ class URLRequestContextGetter;
class TokenService : public GaiaAuthConsumer,
public GaiaOAuthConsumer,
public WebDataServiceConsumer,
- public NotificationObserver {
+ public content::NotificationObserver {
public:
TokenService();
virtual ~TokenService();
@@ -179,10 +179,10 @@ class TokenService : public GaiaAuthConsumer,
virtual void OnWebDataServiceRequestDone(WebDataService::Handle h,
const WDTypedResult* result);
- // NotificationObserver implementation.
+ // content::NotificationObserver implementation.
virtual void Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details);
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details);
private:
@@ -245,7 +245,7 @@ class TokenService : public GaiaAuthConsumer,
// Map from service to token.
std::map<std::string, std::string> token_map_;
- NotificationRegistrar registrar_;
+ content::NotificationRegistrar registrar_;
FRIEND_TEST_ALL_PREFIXES(TokenServiceTest, LoadTokensIntoMemoryBasic);
FRIEND_TEST_ALL_PREFIXES(TokenServiceTest, LoadTokensIntoMemoryAdvanced);
diff --git a/chrome/browser/net/gaia/token_service_unittest.cc b/chrome/browser/net/gaia/token_service_unittest.cc
index 72994c6..396873f 100644
--- a/chrome/browser/net/gaia/token_service_unittest.cc
+++ b/chrome/browser/net/gaia/token_service_unittest.cc
@@ -19,12 +19,13 @@ TokenAvailableTracker::TokenAvailableTracker() {}
TokenAvailableTracker::~TokenAvailableTracker() {}
-void TokenAvailableTracker::Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details) {
+void TokenAvailableTracker::Observe(
+ int type,
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) {
TestNotificationTracker::Observe(type, source, details);
if (type == chrome::NOTIFICATION_TOKEN_AVAILABLE) {
- Details<const TokenService::TokenAvailableDetails> full = details;
+ content::Details<const TokenService::TokenAvailableDetails> full = details;
details_ = *full.ptr();
}
}
@@ -34,11 +35,12 @@ TokenFailedTracker::TokenFailedTracker() {}
TokenFailedTracker::~TokenFailedTracker() {}
void TokenFailedTracker::Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details) {
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) {
TestNotificationTracker::Observe(type, source, details);
if (type == chrome::NOTIFICATION_TOKEN_REQUEST_FAILED) {
- Details<const TokenService::TokenRequestFailedDetails> full = details;
+ content::Details<const TokenService::TokenRequestFailedDetails> full =
+ details;
details_ = *full.ptr();
}
}
@@ -68,9 +70,9 @@ void TokenServiceTestHarness::SetUp() {
WaitForDBLoadCompletion();
success_tracker_.ListenFor(chrome::NOTIFICATION_TOKEN_AVAILABLE,
- Source<TokenService>(&service_));
+ content::Source<TokenService>(&service_));
failure_tracker_.ListenFor(chrome::NOTIFICATION_TOKEN_REQUEST_FAILED,
- Source<TokenService>(&service_));
+ content::Source<TokenService>(&service_));
service_.Initialize("test", profile_.get());
}
diff --git a/chrome/browser/net/gaia/token_service_unittest.h b/chrome/browser/net/gaia/token_service_unittest.h
index ffb9396..689d3b5 100644
--- a/chrome/browser/net/gaia/token_service_unittest.h
+++ b/chrome/browser/net/gaia/token_service_unittest.h
@@ -14,8 +14,8 @@
#include "chrome/common/net/gaia/gaia_auth_consumer.h"
#include "chrome/test/base/signaling_task.h"
#include "chrome/test/base/testing_profile.h"
-#include "content/common/notification_details.h"
-#include "content/common/notification_source.h"
+#include "content/public/browser/notification_details.h"
+#include "content/public/browser/notification_source.h"
#include "content/test/test_notification_tracker.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -33,8 +33,8 @@ class TokenAvailableTracker : public TestNotificationTracker {
private:
virtual void Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details);
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details);
TokenService::TokenAvailableDetails details_;
};
@@ -50,8 +50,8 @@ class TokenFailedTracker : public TestNotificationTracker {
private:
virtual void Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details);
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details);
TokenService::TokenRequestFailedDetails details_;
};
diff --git a/chrome/browser/net/http_server_properties_manager.cc b/chrome/browser/net/http_server_properties_manager.cc
index 48c2adc..995456e 100644
--- a/chrome/browser/net/http_server_properties_manager.cc
+++ b/chrome/browser/net/http_server_properties_manager.cc
@@ -10,8 +10,8 @@
#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/public/browser/notification_details.h"
+#include "content/public/browser/notification_source.h"
namespace chrome_browser_net {
@@ -421,14 +421,15 @@ void HttpServerPropertiesManager::StartAlternateProtocolPrefsUpdateTimerOnIO(
&HttpServerPropertiesManager::UpdateAlternateProtocolPrefsFromCache);
}
-void HttpServerPropertiesManager::Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details) {
+void HttpServerPropertiesManager::Observe(
+ int type,
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
DCHECK(type == chrome::NOTIFICATION_PREF_CHANGED);
- PrefService* prefs = Source<PrefService>(source).ptr();
+ PrefService* prefs = content::Source<PrefService>(source).ptr();
DCHECK(prefs == pref_service_);
- std::string* pref_name = Details<std::string>(details).ptr();
+ std::string* pref_name = content::Details<std::string>(details).ptr();
if (*pref_name == prefs::kSpdyServers) {
if (!setting_spdy_servers_)
ScheduleUpdateSpdyCacheOnUI();
diff --git a/chrome/browser/net/http_server_properties_manager.h b/chrome/browser/net/http_server_properties_manager.h
index b7d6bf0..a505de5 100644
--- a/chrome/browser/net/http_server_properties_manager.h
+++ b/chrome/browser/net/http_server_properties_manager.h
@@ -16,13 +16,11 @@
#include "base/timer.h"
#include "base/values.h"
#include "chrome/browser/prefs/pref_change_registrar.h"
-#include "content/common/notification_observer.h"
+#include "content/public/browser/notification_observer.h"
#include "net/base/host_port_pair.h"
#include "net/http/http_server_properties.h"
#include "net/http/http_server_properties_impl.h"
-class NotificationDetails;
-class NotificationSource;
class PrefService;
namespace chrome_browser_net {
@@ -51,7 +49,7 @@ namespace chrome_browser_net {
// the actual update starts, and grab a WeakPtr.
class HttpServerPropertiesManager
: public net::HttpServerProperties,
- public NotificationObserver {
+ public content::NotificationObserver {
public:
// Create an instance of the HttpServerPropertiesManager. The lifetime of the
// PrefService objects must be longer than that of the
@@ -190,8 +188,8 @@ class HttpServerPropertiesManager
private:
// Callback for preference changes.
virtual void Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details);
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details);
// ---------
// UI thread
diff --git a/chrome/browser/net/net_pref_observer.cc b/chrome/browser/net/net_pref_observer.cc
index 8d59995..c4d1d6a 100644
--- a/chrome/browser/net/net_pref_observer.cc
+++ b/chrome/browser/net/net_pref_observer.cc
@@ -12,7 +12,7 @@
#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/public/browser/notification_details.h"
#include "net/http/http_stream_factory.h"
#include "net/url_request/url_request_throttler_manager.h"
@@ -49,11 +49,11 @@ NetPrefObserver::~NetPrefObserver() {
}
void NetPrefObserver::Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details) {
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) {
DCHECK_EQ(type, chrome::NOTIFICATION_PREF_CHANGED);
- std::string* pref_name = Details<std::string>(details).ptr();
+ std::string* pref_name = content::Details<std::string>(details).ptr();
ApplySettings(pref_name);
}
diff --git a/chrome/browser/net/net_pref_observer.h b/chrome/browser/net/net_pref_observer.h
index 4d2ca47..8e15ce4 100644
--- a/chrome/browser/net/net_pref_observer.h
+++ b/chrome/browser/net/net_pref_observer.h
@@ -10,7 +10,7 @@
#include "base/basictypes.h"
#include "chrome/browser/prefs/pref_member.h"
-#include "content/common/notification_observer.h"
+#include "content/public/browser/notification_observer.h"
class Profile;
@@ -25,7 +25,7 @@ class PrerenderManager;
// Monitors network-related preferences for changes and applies them.
// The supplied PrefService must outlive this NetPrefObserver.
// Must be used only on the UI thread.
-class NetPrefObserver : public NotificationObserver {
+class NetPrefObserver : public content::NotificationObserver {
public:
// |prefs| must be non-NULL and |*prefs| must outlive this.
// |prerender_manager| may be NULL. If not, |*prerender_manager| must
@@ -35,10 +35,10 @@ class NetPrefObserver : public NotificationObserver {
chrome_browser_net::Predictor* predictor);
virtual ~NetPrefObserver();
- // NotificationObserver
+ // content::NotificationObserver
virtual void Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details);
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details);
static void RegisterPrefs(PrefService* prefs);
diff --git a/chrome/browser/net/pref_proxy_config_service.cc b/chrome/browser/net/pref_proxy_config_service.cc
index c726285..3305e6c 100644
--- a/chrome/browser/net/pref_proxy_config_service.cc
+++ b/chrome/browser/net/pref_proxy_config_service.cc
@@ -11,8 +11,8 @@
#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/public/browser/notification_details.h"
+#include "content/public/browser/notification_source.h"
PrefProxyConfigTracker::PrefProxyConfigTracker(PrefService* pref_service)
: pref_service_(pref_service) {
@@ -52,12 +52,13 @@ void PrefProxyConfigTracker::RemoveObserver(
observers_.RemoveObserver(observer);
}
-void PrefProxyConfigTracker::Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details) {
+void PrefProxyConfigTracker::Observe(
+ int type,
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
if (type == chrome::NOTIFICATION_PREF_CHANGED &&
- Source<PrefService>(source).ptr() == pref_service_) {
+ content::Source<PrefService>(source).ptr() == pref_service_) {
net::ProxyConfig new_config;
ConfigState config_state = ReadPrefConfig(&new_config);
BrowserThread::PostTask(
diff --git a/chrome/browser/net/pref_proxy_config_service.h b/chrome/browser/net/pref_proxy_config_service.h
index a7678b7..3f9ee75 100644
--- a/chrome/browser/net/pref_proxy_config_service.h
+++ b/chrome/browser/net/pref_proxy_config_service.h
@@ -11,7 +11,7 @@
#include "base/memory/scoped_ptr.h"
#include "base/observer_list.h"
#include "chrome/browser/prefs/proxy_config_dictionary.h"
-#include "content/common/notification_observer.h"
+#include "content/public/browser/notification_observer.h"
#include "net/proxy/proxy_config.h"
#include "net/proxy/proxy_config_service.h"
@@ -23,7 +23,7 @@ class PrefSetObserver;
// PrefProxyConfigService to use.
class PrefProxyConfigTracker
: public base::RefCountedThreadSafe<PrefProxyConfigTracker>,
- public NotificationObserver {
+ public content::NotificationObserver {
public:
// Observer interface used to send out notifications on the IO thread about
// changes to the proxy configuration.
@@ -62,10 +62,10 @@ class PrefProxyConfigTracker
friend class base::RefCountedThreadSafe<PrefProxyConfigTracker>;
virtual ~PrefProxyConfigTracker();
- // NotificationObserver implementation:
+ // content::NotificationObserver implementation:
virtual void Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details);
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details);
// Install a new configuration. This is invoked on the IO thread to update
// the internal state after handling a pref change on the UI thread.
diff --git a/chrome/browser/net/ssl_config_service_manager_pref.cc b/chrome/browser/net/ssl_config_service_manager_pref.cc
index 48a6d27..8c538ba 100644
--- a/chrome/browser/net/ssl_config_service_manager_pref.cc
+++ b/chrome/browser/net/ssl_config_service_manager_pref.cc
@@ -17,8 +17,8 @@
#include "chrome/common/chrome_switches.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/public/browser/notification_details.h"
+#include "content/public/browser/notification_source.h"
#include "net/base/ssl_cipher_suite_names.h"
#include "net/base/ssl_config_service.h"
@@ -108,7 +108,7 @@ void SSLConfigServicePref::SetNewSSLConfig(
// The manager for holding and updating an SSLConfigServicePref instance.
class SSLConfigServiceManagerPref
: public SSLConfigServiceManager,
- public NotificationObserver {
+ public content::NotificationObserver {
public:
explicit SSLConfigServiceManagerPref(PrefService* local_state);
virtual ~SSLConfigServiceManagerPref() {}
@@ -122,8 +122,8 @@ class SSLConfigServiceManagerPref
// Callback for preference changes. This will post the changes to the IO
// thread with SetNewSSLConfig.
virtual void Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details);
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details);
// Store SSL config settings in |config|, directly from the preferences. Must
// only be called from UI thread.
@@ -174,13 +174,14 @@ net::SSLConfigService* SSLConfigServiceManagerPref::Get() {
return ssl_config_service_;
}
-void SSLConfigServiceManagerPref::Observe(int type,
- const NotificationSource& source,
- const NotificationDetails& details) {
+void SSLConfigServiceManagerPref::Observe(
+ int type,
+ const content::NotificationSource& source,
+ const content::NotificationDetails& details) {
if (type == chrome::NOTIFICATION_PREF_CHANGED) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
- std::string* pref_name_in = Details<std::string>(details).ptr();
- PrefService* prefs = Source<PrefService>(source).ptr();
+ std::string* pref_name_in = content::Details<std::string>(details).ptr();
+ PrefService* prefs = content::Source<PrefService>(source).ptr();
DCHECK(pref_name_in && prefs);
if (*pref_name_in == prefs::kCipherSuiteBlacklist)
OnDisabledCipherSuitesChange(prefs);
generated by cgit v1.1 at 2025-05-13 10:58:23 +0000