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

Side by Side Diff: chrome/browser/chromeos/proxy_config_service_impl.cc

Issue 8437002: Move BrowserThread to content namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: A few updates. Created 9 years, 1 month 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/chromeos/proxy_config_service_impl.h" 5 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
6 6
7 #include <ostream> 7 #include <ostream>
8 8
9 #include "base/json/json_value_serializer.h" 9 #include "base/json/json_value_serializer.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/string_util.h" 11 #include "base/string_util.h"
12 #include "base/task.h" 12 #include "base/task.h"
13 #include "chrome/browser/chromeos/cros/cros_library.h" 13 #include "chrome/browser/chromeos/cros/cros_library.h"
14 #include "chrome/browser/chromeos/cros_settings_names.h" 14 #include "chrome/browser/chromeos/cros_settings_names.h"
15 #include "chrome/browser/policy/proto/chrome_device_policy.pb.h" 15 #include "chrome/browser/policy/proto/chrome_device_policy.pb.h"
16 #include "chrome/browser/prefs/proxy_config_dictionary.h" 16 #include "chrome/browser/prefs/proxy_config_dictionary.h"
17 #include "chrome/browser/prefs/proxy_prefs.h" 17 #include "chrome/browser/prefs/proxy_prefs.h"
18 #include "content/public/browser/browser_thread.h" 18 #include "content/public/browser/browser_thread.h"
19 #include "grit/generated_resources.h" 19 #include "grit/generated_resources.h"
20 #include "ui/base/l10n/l10n_util.h" 20 #include "ui/base/l10n/l10n_util.h"
21 21
22 using content::BrowserThread;
23
22 namespace em = enterprise_management; 24 namespace em = enterprise_management;
23 25
24 namespace chromeos { 26 namespace chromeos {
25 27
26 namespace { 28 namespace {
27 29
28 const char* SourceToString(ProxyConfigServiceImpl::ProxyConfig::Source source) { 30 const char* SourceToString(ProxyConfigServiceImpl::ProxyConfig::Source source) {
29 switch (source) { 31 switch (source) {
30 case ProxyConfigServiceImpl::ProxyConfig::SOURCE_NONE: 32 case ProxyConfigServiceImpl::ProxyConfig::SOURCE_NONE:
31 return "SOURCE_NONE"; 33 return "SOURCE_NONE";
(...skipping 817 matching lines...) Expand 10 before | Expand all | Expand 10 after
849 851
850 void ProxyConfigServiceImpl::CheckCurrentlyOnIOThread() { 852 void ProxyConfigServiceImpl::CheckCurrentlyOnIOThread() {
851 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); 853 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
852 } 854 }
853 855
854 void ProxyConfigServiceImpl::CheckCurrentlyOnUIThread() { 856 void ProxyConfigServiceImpl::CheckCurrentlyOnUIThread() {
855 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 857 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
856 } 858 }
857 859
858 } // namespace chromeos 860 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698