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

Unified Diff: chrome/browser/chromeos/login/proxy_settings_dialog.cc

Issue 13633003: Part of multiprofile implementation. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: m Created 7 years, 8 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/chromeos/login/proxy_settings_dialog.cc
diff --git a/chrome/browser/chromeos/login/proxy_settings_dialog.cc b/chrome/browser/chromeos/login/proxy_settings_dialog.cc
index 2de8189a09ff545902ace8d9d30a00b0889f325b..bfdb8cff2d0f2f2decad74226dac7be4f5551988 100644
--- a/chrome/browser/chromeos/login/proxy_settings_dialog.cc
+++ b/chrome/browser/chromeos/login/proxy_settings_dialog.cc
@@ -6,9 +6,9 @@
#include "base/utf_string_conversions.h"
#include "chrome/browser/chromeos/login/helper.h"
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/chromeos/proxy_config_service_impl.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/url_constants.h"
#include "content/public/browser/browser_thread.h"
@@ -58,7 +58,7 @@ ProxySettingsDialog::ProxySettingsDialog(LoginWebDialog::Delegate* delegate,
kProxySettingsDialogReasonableHeightRatio));
// Get network name for dialog title.
- Profile* profile = ProfileManager::GetDefaultProfile();
+ Profile* profile = ProfileHelper::GetSigninProfile();
PrefProxyConfigTracker* proxy_tracker = profile->GetProxyConfigTracker();
proxy_tracker->UIMakeActiveNetworkCurrent();
std::string network_name;
« no previous file with comments | « chrome/browser/chromeos/login/login_web_dialog.cc ('k') | chrome/browser/chromeos/login/screens/terms_of_service_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698