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

Side by Side Diff: chrome/browser/chromeos/net/onc_utils.cc

Issue 106433007: Update some uses of Value in chrome/browser to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 years, 12 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/net/onc_utils.h" 5 #include "chrome/browser/chromeos/net/onc_utils.h"
6 6
7 #include "base/bind_helpers.h" 7 #include "base/bind_helpers.h"
8 #include "base/json/json_writer.h" 8 #include "base/json/json_writer.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 } 99 }
100 return rules; 100 return rules;
101 } 101 }
102 102
103 } // namespace 103 } // namespace
104 104
105 scoped_ptr<base::DictionaryValue> ConvertOncProxySettingsToProxyConfig( 105 scoped_ptr<base::DictionaryValue> ConvertOncProxySettingsToProxyConfig(
106 const base::DictionaryValue& onc_proxy_settings) { 106 const base::DictionaryValue& onc_proxy_settings) {
107 std::string type; 107 std::string type;
108 onc_proxy_settings.GetStringWithoutPathExpansion(::onc::proxy::kType, &type); 108 onc_proxy_settings.GetStringWithoutPathExpansion(::onc::proxy::kType, &type);
109 scoped_ptr<DictionaryValue> proxy_dict; 109 scoped_ptr<base::DictionaryValue> proxy_dict;
110 110
111 if (type == ::onc::proxy::kDirect) { 111 if (type == ::onc::proxy::kDirect) {
112 proxy_dict.reset(ProxyConfigDictionary::CreateDirect()); 112 proxy_dict.reset(ProxyConfigDictionary::CreateDirect());
113 } else if (type == ::onc::proxy::kWPAD) { 113 } else if (type == ::onc::proxy::kWPAD) {
114 proxy_dict.reset(ProxyConfigDictionary::CreateAutoDetect()); 114 proxy_dict.reset(ProxyConfigDictionary::CreateAutoDetect());
115 } else if (type == ::onc::proxy::kPAC) { 115 } else if (type == ::onc::proxy::kPAC) {
116 std::string pac_url; 116 std::string pac_url;
117 onc_proxy_settings.GetStringWithoutPathExpansion(::onc::proxy::kPAC, 117 onc_proxy_settings.GetStringWithoutPathExpansion(::onc::proxy::kPAC,
118 &pac_url); 118 &pac_url);
119 GURL url(pac_url); 119 GURL url(pac_url);
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
449 const PrefService* local_state_prefs, 449 const PrefService* local_state_prefs,
450 const FavoriteState& network) { 450 const FavoriteState& network) {
451 ::onc::ONCSource ignored_onc_source; 451 ::onc::ONCSource ignored_onc_source;
452 const base::DictionaryValue* policy = onc::GetPolicyForFavoriteNetwork( 452 const base::DictionaryValue* policy = onc::GetPolicyForFavoriteNetwork(
453 profile_prefs, local_state_prefs, network, &ignored_onc_source); 453 profile_prefs, local_state_prefs, network, &ignored_onc_source);
454 return policy != NULL; 454 return policy != NULL;
455 } 455 }
456 456
457 } // namespace onc 457 } // namespace onc
458 } // namespace chromeos 458 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/mobile_config.cc ('k') | chrome/browser/chromeos/notifications/balloon_view_host_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698