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

Side by Side Diff: chrome/browser/chromeos/proxy_cros_settings_provider.h

Issue 8091002: PART2: Make SignedSettings use proper Value types instead of string all around the place. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments and rebased on a the current PART1 version. Created 9 years, 2 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 #ifndef CHROME_BROWSER_CHROMEOS_PROXY_CROS_SETTINGS_PROVIDER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_PROXY_CROS_SETTINGS_PROVIDER_H_
6 #define CHROME_BROWSER_CHROMEOS_PROXY_CROS_SETTINGS_PROVIDER_H_ 6 #define CHROME_BROWSER_CHROMEOS_PROXY_CROS_SETTINGS_PROVIDER_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/callback.h" 9 #include "base/callback.h"
10 #include "base/memory/singleton.h" 10 #include "base/memory/singleton.h"
(...skipping 23 matching lines...) Expand all
34 34
35 // Returns name of current network that has been set via SetCurrentNetwork or 35 // Returns name of current network that has been set via SetCurrentNetwork or
36 // MakeActiveNetworkCurrent. 36 // MakeActiveNetworkCurrent.
37 const std::string& GetCurrentNetworkName() const; 37 const std::string& GetCurrentNetworkName() const;
38 38
39 // Returns true if user has selected to use shared proxies. 39 // Returns true if user has selected to use shared proxies.
40 bool IsUsingSharedProxies() const; 40 bool IsUsingSharedProxies() const;
41 41
42 private: 42 private:
43 // CrosSettingsProvider implementation. 43 // CrosSettingsProvider implementation.
44 virtual void DoSet(const std::string& path, Value* value) OVERRIDE; 44 virtual void DoSet(const std::string& path,
45 const base::Value& value) OVERRIDE;
45 46
46 chromeos::ProxyConfigServiceImpl* GetConfigService() const; 47 chromeos::ProxyConfigServiceImpl* GetConfigService() const;
47 48
48 net::ProxyServer CreateProxyServerFromHost( 49 net::ProxyServer CreateProxyServerFromHost(
49 const std::string& host, 50 const std::string& host,
50 const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy, 51 const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy,
51 net::ProxyServer::Scheme scheme) const; 52 net::ProxyServer::Scheme scheme) const;
52 53
53 net::ProxyServer CreateProxyServerFromPort( 54 net::ProxyServer CreateProxyServerFromPort(
54 uint16 port, 55 uint16 port,
55 const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy, 56 const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy,
56 net::ProxyServer::Scheme scheme) const; 57 net::ProxyServer::Scheme scheme) const;
57 58
58 Value* CreateServerHostValue( 59 Value* CreateServerHostValue(
59 const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy) const; 60 const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy) const;
60 61
61 Value* CreateServerPortValue( 62 Value* CreateServerPortValue(
62 const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy) const; 63 const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy) const;
63 64
64 DISALLOW_COPY_AND_ASSIGN(ProxyCrosSettingsProvider); 65 DISALLOW_COPY_AND_ASSIGN(ProxyCrosSettingsProvider);
65 }; 66 };
66 67
67 } // namespace chromeos 68 } // namespace chromeos
68 69
69 #endif // CHROME_BROWSER_CHROMEOS_PROXY_CROS_SETTINGS_PROVIDER_H_ 70 #endif // CHROME_BROWSER_CHROMEOS_PROXY_CROS_SETTINGS_PROVIDER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698