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

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

Issue 7867044: PART1: Initiated the SignedSettings refactoring. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments from Chris and rebased to ToT to get it running on the try servers again. 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/memory/singleton.h" 10 #include "base/memory/singleton.h"
10 #include "base/values.h" 11 #include "base/values.h"
11 #include "chrome/browser/chromeos/cros_settings_provider.h" 12 #include "chrome/browser/chromeos/cros_settings_provider.h"
12 #include "chrome/browser/chromeos/proxy_config_service_impl.h" 13 #include "chrome/browser/chromeos/proxy_config_service_impl.h"
13 14
14 namespace chromeos { 15 namespace chromeos {
15 16
16 class ProxyCrosSettingsProvider : public CrosSettingsProvider { 17 class ProxyCrosSettingsProvider : public CrosSettingsProvider {
17 public: 18 public:
18 ProxyCrosSettingsProvider(); 19 ProxyCrosSettingsProvider();
20
19 // CrosSettingsProvider implementation. 21 // CrosSettingsProvider implementation.
20 virtual bool Get(const std::string& path, Value** out_value) const OVERRIDE; 22 virtual const base::Value* Get(const std::string& path) const OVERRIDE;
23 virtual bool GetTrusted(const std::string& path,
24 const base::Closure& callback) const OVERRIDE;
21 virtual bool HandlesSetting(const std::string& path) const OVERRIDE; 25 virtual bool HandlesSetting(const std::string& path) const OVERRIDE;
22 26
23 // Set the current network whose proxy settings will be displayed and possibly 27 // Set the current network whose proxy settings will be displayed and possibly
24 // edited on. 28 // edited on.
25 void SetCurrentNetwork(const std::string& network); 29 void SetCurrentNetwork(const std::string& network);
26 30
27 // Make the active network the current one whose proxy settings will be 31 // Make the active network the current one whose proxy settings will be
28 // displayed and possibly edited on. 32 // displayed and possibly edited on.
29 void MakeActiveNetworkCurrent(); 33 void MakeActiveNetworkCurrent();
30 34
(...skipping 25 matching lines...) Expand all
56 60
57 Value* CreateServerPortValue( 61 Value* CreateServerPortValue(
58 const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy) const; 62 const ProxyConfigServiceImpl::ProxyConfig::ManualProxy& proxy) const;
59 63
60 DISALLOW_COPY_AND_ASSIGN(ProxyCrosSettingsProvider); 64 DISALLOW_COPY_AND_ASSIGN(ProxyCrosSettingsProvider);
61 }; 65 };
62 66
63 } // namespace chromeos 67 } // namespace chromeos
64 68
65 #endif // CHROME_BROWSER_CHROMEOS_PROXY_CROS_SETTINGS_PROVIDER_H_ 69 #endif // CHROME_BROWSER_CHROMEOS_PROXY_CROS_SETTINGS_PROVIDER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698