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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/login/webui_login_display_host.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/bookmarks/bookmark_manager_extension_api.cc ('k') | chrome/browser/chromeos/login/webui_login_view.cc » ('j') | content/browser/tab_contents/render_view_host_manager_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/webui_login_display_host.cc
===================================================================
--- chrome/browser/chromeos/login/webui_login_display_host.cc (revision 117871)
+++ chrome/browser/chromeos/login/webui_login_display_host.cc (working copy)
@@ -11,6 +11,7 @@
#include "chrome/browser/chromeos/login/webui_login_view.h"
#include "chrome/browser/chromeos/login/wizard_controller.h"
#include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
+#include "content/browser/webui/web_ui.h"
#include "ui/views/widget/widget.h"
#if defined(USE_AURA)
@@ -149,7 +150,7 @@
}
OobeUI* WebUILoginDisplayHost::GetOobeUI() const {
- return static_cast<OobeUI*>(login_view_->GetWebUI());
+ return static_cast<OobeUI*>(login_view_->GetWebUI()->GetController());
}
WizardController* WebUILoginDisplayHost::CreateWizardController() {
« no previous file with comments | « chrome/browser/bookmarks/bookmark_manager_extension_api.cc ('k') | chrome/browser/chromeos/login/webui_login_view.cc » ('j') | content/browser/tab_contents/render_view_host_manager_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698