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

Unified Diff: chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc

Issue 18112018: Cleanup the UseSharedProxies preference. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Added a missing member initializer. Created 7 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
index 46467bd550aaa805c8ed9b7c61979b4aa44ef7f4..89a9e03b95833dc3825749c3d7470b91ac40a334 100644
--- a/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
+++ b/chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc
@@ -13,6 +13,7 @@
#include "base/strings/utf_string_conversions.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/chromeos/login/user_manager.h"
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/chromeos/proxy_cros_settings_parser.h"
#include "chrome/browser/chromeos/settings/cros_settings.h"
#include "chrome/browser/policy/browser_policy_connector.h"
@@ -108,13 +109,15 @@ void CoreChromeOSOptionsHandler::InitializeHandler() {
CoreOptionsHandler::InitializeHandler();
- PrefService* prefs = Profile::FromWebUI(web_ui())->GetPrefs();
+ Profile* profile = Profile::FromWebUI(web_ui());
+ PrefService* prefs = profile->GetPrefs();
proxy_prefs_.Init(prefs);
proxy_prefs_.Add(prefs::kProxy,
base::Bind(&CoreChromeOSOptionsHandler::OnPreferenceChanged,
base::Unretained(this),
prefs));
- proxy_config_service_.SetPrefs(prefs);
+ proxy_config_service_.SetPrefs(ProfileHelper::IsSigninProfile(profile),
+ prefs);
}
base::Value* CoreChromeOSOptionsHandler::FetchPref(

Powered by Google App Engine
This is Rietveld 408576698