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

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

Issue 14066013: Revert 194348 "Part of multiprofile implementation." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: 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: trunk/src/chrome/browser/chromeos/login/proxy_settings_dialog.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/login/proxy_settings_dialog.cc (revision 194361)
+++ trunk/src/chrome/browser/chromeos/login/proxy_settings_dialog.cc (working copy)
@@ -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 @@
kProxySettingsDialogReasonableHeightRatio));
// Get network name for dialog title.
- Profile* profile = ProfileHelper::GetSigninProfile();
+ Profile* profile = ProfileManager::GetDefaultProfile();
PrefProxyConfigTracker* proxy_tracker = profile->GetProxyConfigTracker();
proxy_tracker->UIMakeActiveNetworkCurrent();
std::string network_name;

Powered by Google App Engine
This is Rietveld 408576698