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

Unified Diff: chrome/browser/chromeos/login/webui_login_view.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
« no previous file with comments | « chrome/browser/chromeos/login/user_manager_impl.cc ('k') | chrome/browser/chromeos/profile_startup.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/webui_login_view.cc
diff --git a/chrome/browser/chromeos/login/webui_login_view.cc b/chrome/browser/chromeos/login/webui_login_view.cc
index 0d12cd2277c6fc0b0022c774e4241a29240cab5d..b2dcb0fe465efbb242d60fe842dab41debde81d6 100644
--- a/chrome/browser/chromeos/login/webui_login_view.cc
+++ b/chrome/browser/chromeos/login/webui_login_view.cc
@@ -17,10 +17,10 @@
#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/media/media_stream_infobar_delegate.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/web_contents_modal_dialog_manager.h"
#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
@@ -152,7 +152,9 @@ WebUILoginView::~WebUILoginView() {
void WebUILoginView::Init(views::Widget* login_window) {
login_window_ = login_window;
- webui_login_ = new views::WebView(ProfileManager::GetDefaultProfile());
+
+ Profile* signin_profile = ProfileHelper::GetSigninProfile();
+ webui_login_ = new views::WebView(signin_profile);
AddChildView(webui_login_);
WebContents* web_contents = webui_login_->GetWebContents();
@@ -168,7 +170,7 @@ void WebUILoginView::Init(views::Widget* login_window) {
web_contents->SetDelegate(this);
renderer_preferences_util::UpdateFromSystemSettings(
web_contents->GetMutableRendererPrefs(),
- ProfileManager::GetDefaultProfile());
+ signin_profile);
registrar_.Add(this,
content::NOTIFICATION_WEB_CONTENTS_RENDER_VIEW_HOST_CREATED,
« no previous file with comments | « chrome/browser/chromeos/login/user_manager_impl.cc ('k') | chrome/browser/chromeos/profile_startup.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698