chrome/browser/ui/webui/chromeos/login/oobe_ui.h - 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/ui/webui/chromeos/login/oobe_ui.h

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/ui/webui/chromeos/login/network_screen_handler.cc ('k') | chrome/browser/ui/webui/chromeos/login/oobe_ui.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/ui/webui/chromeos/login/oobe_ui.h

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

--- chrome/browser/ui/webui/chromeos/login/oobe_ui.h (revision 117871)

+++ chrome/browser/ui/webui/chromeos/login/oobe_ui.h (working copy)

@@ -6,8 +6,10 @@

#define CHROME_BROWSER_UI_WEBUI_CHROMEOS_LOGIN_OOBE_UI_H_

#pragma once

+#include <vector>

+#include "base/compiler_specific.h"

#include "chrome/browser/chromeos/login/oobe_display.h"

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

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

namespace base {

@@ -28,9 +30,9 @@

// - eula screen (CrOS (+ OEM) EULA content/TPM password/crash reporting).

// - update screen.

class OobeUI : public OobeDisplay,

- public WebUI, public content::WebUIController {

+ public content::WebUIController {

public:

- explicit OobeUI(content::WebContents* contents);

+ explicit OobeUI(WebUI* web_ui);

// OobeDisplay implementation:

virtual void ShowScreen(WizardScreen* screen) OVERRIDE;

@@ -79,6 +81,8 @@

SigninScreenHandler* signin_screen_handler_;

UserImageScreenActor* user_image_screen_actor_;

+ std::vector<BaseScreenHandler*> handlers_; // Non-owning pointers.

DISALLOW_COPY_AND_ASSIGN(OobeUI);

};