| Index: chrome/browser/chromeos/proxy_cros_settings_provider.h
|
| ===================================================================
|
| --- chrome/browser/chromeos/proxy_cros_settings_provider.h (revision 103881)
|
| +++ chrome/browser/chromeos/proxy_cros_settings_provider.h (working copy)
|
| @@ -21,20 +21,18 @@
|
| virtual bool HandlesSetting(const std::string& path) const OVERRIDE;
|
|
|
| // Set the current network whose proxy settings will be displayed and possibly
|
| - // edited on.
|
| - void SetCurrentNetwork(const std::string& network);
|
| + // edited on, with current user profile.
|
| + void SetCurrentNetworkWithProfile(const std::string& network,
|
| + Profile* profile);
|
|
|
| // Make the active network the current one whose proxy settings will be
|
| - // displayed and possibly edited on.
|
| - void MakeActiveNetworkCurrent();
|
| + // displayed and possibly edited on, with current user profile.
|
| + void MakeActiveNetworkCurrentWithProfile(Profile* profile);
|
|
|
| // Returns name of current network that has been set via SetCurrentNetwork or
|
| // MakeActiveNetworkCurrent.
|
| const std::string& GetCurrentNetworkName() const;
|
|
|
| - // Returns true if user has selected to use shared proxies.
|
| - bool IsUsingSharedProxies() const;
|
| -
|
| private:
|
| // CrosSettingsProvider implementation.
|
| virtual void DoSet(const std::string& path, Value* value) OVERRIDE;
|
|
|