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

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

Issue 12340111: Introduce //components/user_prefs, use to eliminate c/b/prefs dependency in Autofill. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pure merge of LKGR Created 7 years, 9 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
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/prefs/pref_registry_syncable.h"
12 #include "chrome/browser/prefs/proxy_config_dictionary.h" 11 #include "chrome/browser/prefs/proxy_config_dictionary.h"
13 #include "chrome/common/chrome_notification_types.h" 12 #include "chrome/common/chrome_notification_types.h"
14 #include "chrome/common/pref_names.h" 13 #include "chrome/common/pref_names.h"
14 #include "components/user_prefs/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 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
337 config_state = ProxyPrefs::CONFIG_EXTENSION; 337 config_state = ProxyPrefs::CONFIG_EXTENSION;
338 else 338 else
339 config_state = ProxyPrefs::CONFIG_OTHER_PRECEDE; 339 config_state = ProxyPrefs::CONFIG_OTHER_PRECEDE;
340 } else { 340 } else {
341 config_state = ProxyPrefs::CONFIG_FALLBACK; 341 config_state = ProxyPrefs::CONFIG_FALLBACK;
342 } 342 }
343 } 343 }
344 344
345 return config_state; 345 return config_state;
346 } 346 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698