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

Side by Side Diff: chrome/browser/net/pref_proxy_config_tracker_impl.cc

Issue 271793003: components: Extract pref_registry component out of user_prefs. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/net/predictor.cc ('k') | chrome/browser/network_time/network_time_service.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h" 5 #include "chrome/browser/net/pref_proxy_config_tracker_impl.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/prefs/pref_registry_simple.h" 8 #include "base/prefs/pref_registry_simple.h"
9 #include "base/prefs/pref_service.h" 9 #include "base/prefs/pref_service.h"
10 #include "base/values.h" 10 #include "base/values.h"
11 #include "chrome/browser/chrome_notification_types.h" 11 #include "chrome/browser/chrome_notification_types.h"
12 #include "chrome/browser/prefs/proxy_config_dictionary.h" 12 #include "chrome/browser/prefs/proxy_config_dictionary.h"
13 #include "chrome/common/pref_names.h" 13 #include "chrome/common/pref_names.h"
14 #include "components/user_prefs/pref_registry_syncable.h" 14 #include "components/pref_registry/pref_registry_syncable.h"
15 #include "content/public/browser/browser_thread.h" 15 #include "content/public/browser/browser_thread.h"
16 #include "content/public/browser/notification_details.h" 16 #include "content/public/browser/notification_details.h"
17 #include "content/public/browser/notification_source.h" 17 #include "content/public/browser/notification_source.h"
18 18
19 using content::BrowserThread; 19 using content::BrowserThread;
20 20
21 //============================= ChromeProxyConfigService ======================= 21 //============================= ChromeProxyConfigService =======================
22 22
23 ChromeProxyConfigService::ChromeProxyConfigService( 23 ChromeProxyConfigService::ChromeProxyConfigService(
24 net::ProxyConfigService* base_service) 24 net::ProxyConfigService* base_service)
(...skipping 323 matching lines...) Expand 10 before | Expand all | Expand 10 after
348 (config_state_ != ProxyPrefs::CONFIG_UNSET && 348 (config_state_ != ProxyPrefs::CONFIG_UNSET &&
349 !pref_config_.Equals(new_config))) { 349 !pref_config_.Equals(new_config))) {
350 config_state_ = config_state; 350 config_state_ = config_state;
351 if (config_state_ != ProxyPrefs::CONFIG_UNSET) 351 if (config_state_ != ProxyPrefs::CONFIG_UNSET)
352 pref_config_ = new_config; 352 pref_config_ = new_config;
353 update_pending_ = true; 353 update_pending_ = true;
354 } 354 }
355 if (update_pending_) 355 if (update_pending_)
356 OnProxyConfigChanged(config_state, new_config); 356 OnProxyConfigChanged(config_state, new_config);
357 } 357 }
OLDNEW
« no previous file with comments | « chrome/browser/net/predictor.cc ('k') | chrome/browser/network_time/network_time_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698