chrome/browser/chromeos/login/webui_screen_locker.cc - Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: sync to head to clear linux_chromeos browsertest failures Created 8 years, 11 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/webui_login_view.cc ('k') | chrome/browser/download/download_browsertest.cc » ('j') | content/browser/tab_contents/render_view_host_manager_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/login/webui_screen_locker.cc

===================================================================

--- chrome/browser/chromeos/login/webui_screen_locker.cc (revision 117871)

+++ chrome/browser/chromeos/login/webui_screen_locker.cc (working copy)

@@ -18,6 +18,7 @@

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/url_constants.h"

#include "content/browser/renderer_host/render_widget_host_view.h"

+#include "content/browser/webui/web_ui.h"

#include "content/public/browser/notification_service.h"

#include "content/public/browser/notification_types.h"

#include "ui/base/l10n/l10n_util.h"

@@ -61,7 +62,8 @@

login_display_->set_background_bounds(bounds);

login_display_->Init(users, false, true, false);

- static_cast<OobeUI*>(GetWebUI())->ShowSigninScreen(login_display_.get());

+ static_cast<OobeUI*>(GetWebUI()->GetController())->ShowSigninScreen(

+ login_display_.get());

registrar_.Add(this,

chrome::NOTIFICATION_LOGIN_USER_IMAGE_CHANGED,

@@ -119,8 +121,10 @@

lock_window_->Close();

// If LockScreen() was called, we need to clear the signin screen handler

// delegate set in ShowSigninScreen so that it no longer points to us.

- if (login_display_.get())

- static_cast<OobeUI*>(GetWebUI())->ResetSigninScreenHandlerDelegate();

+ if (login_display_.get()) {

+ static_cast<OobeUI*>(GetWebUI()->GetController())->

+ ResetSigninScreenHandlerDelegate();

+ }

SetStatusAreaEnabled(true);

}