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

Unified Diff: trunk/src/chrome/browser/chromeos/login/webui_login_view.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/webui_login_view.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/login/webui_login_view.cc (revision 194361)
+++ trunk/src/chrome/browser/chromeos/login/webui_login_view.cc (working copy)
@@ -17,9 +17,9 @@
#include "chrome/browser/chromeos/login/base_login_display_host.h"
#include "chrome/browser/chromeos/login/proxy_settings_dialog.h"
#include "chrome/browser/chromeos/login/webui_login_display.h"
-#include "chrome/browser/chromeos/profiles/profile_helper.h"
#include "chrome/browser/password_manager/password_manager.h"
#include "chrome/browser/password_manager/password_manager_delegate_impl.h"
+#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/browser/renderer_preferences_util.h"
#include "chrome/browser/ui/media_stream_infobar_delegate.h"
#include "chrome/browser/ui/web_contents_modal_dialog_manager.h"
@@ -152,9 +152,7 @@
void WebUILoginView::Init(views::Widget* login_window) {
login_window_ = login_window;
-
- Profile* signin_profile = ProfileHelper::GetSigninProfile();
- webui_login_ = new views::WebView(signin_profile);
+ webui_login_ = new views::WebView(ProfileManager::GetDefaultProfile());
AddChildView(webui_login_);
WebContents* web_contents = webui_login_->GetWebContents();
@@ -170,7 +168,7 @@
web_contents->SetDelegate(this);
renderer_preferences_util::UpdateFromSystemSettings(
web_contents->GetMutableRendererPrefs(),
- signin_profile);
+ ProfileManager::GetDefaultProfile());
registrar_.Add(this,
content::NOTIFICATION_WEB_CONTENTS_RENDER_VIEW_HOST_CREATED,
« no previous file with comments | « trunk/src/chrome/browser/chromeos/login/user_manager_impl.cc ('k') | trunk/src/chrome/browser/chromeos/profile_startup.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698