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

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

Issue 2442313003: Move some proxy config code out of src/chrome (Closed)
Patch Set: Fix DEPS Created 4 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
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/proxy_cros_settings_parser.h" 5 #include "chrome/browser/chromeos/proxy_cros_settings_parser.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/chromeos/ui_proxy_config.h" 12 #include "chromeos/network/proxy/ui_proxy_config.h"
13 #include "chrome/browser/chromeos/ui_proxy_config_service.h" 13 #include "chromeos/network/proxy/ui_proxy_config_service.h"
14 14
15 namespace chromeos { 15 namespace chromeos {
16 16
17 namespace { 17 namespace {
18 18
19 base::Value* CreateServerHostValue(const UIProxyConfig::ManualProxy& proxy) { 19 base::Value* CreateServerHostValue(const UIProxyConfig::ManualProxy& proxy) {
20 return proxy.server.is_valid() ? 20 return proxy.server.is_valid() ?
21 new base::StringValue(proxy.server.host_port_pair().host()) : 21 new base::StringValue(proxy.server.host_port_pair().host()) :
22 NULL; 22 NULL;
23 } 23 }
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
366 } else { 366 } else {
367 dict->SetBoolean("disabled", false); 367 dict->SetBoolean("disabled", false);
368 } 368 }
369 *out_value = dict; 369 *out_value = dict;
370 return true; 370 return true;
371 } 371 }
372 372
373 } // namespace proxy_cros_settings_parser 373 } // namespace proxy_cros_settings_parser
374 374
375 } // namespace chromeos 375 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/proxy_config_service_impl_unittest.cc ('k') | chrome/browser/chromeos/ui_proxy_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698