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

Unified Diff: chrome/browser/chromeos/login/base_login_display_host.h

Issue 7111033: Ties up OOBE controllers and WebUI handlers. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 6 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 | « no previous file | chrome/browser/chromeos/login/base_login_display_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/base_login_display_host.h
diff --git a/chrome/browser/chromeos/login/base_login_display_host.h b/chrome/browser/chromeos/login/base_login_display_host.h
index 3e144238c4743f3ed309dee3b52fba476d8f90ee..91da4843b734018954e8e31e117ca7218ef03d3a 100644
--- a/chrome/browser/chromeos/login/base_login_display_host.h
+++ b/chrome/browser/chromeos/login/base_login_display_host.h
@@ -22,6 +22,7 @@ class Widget;
namespace chromeos {
class ExistingUserController;
+class ViewsOobeDisplay;
class WizardController;
// An abstract base class that defines OOBE/login screen host.
@@ -44,6 +45,9 @@ class BaseLoginDisplayHost : public LoginDisplayHost,
const GURL& start_url);
virtual void StartSignInScreen();
+ // Implementation specific WizardController creation method.
+ virtual WizardController* CreateWizardController();
+
const gfx::Rect& background_bounds() const { return background_bounds_; }
private:
@@ -66,6 +70,11 @@ class BaseLoginDisplayHost : public LoginDisplayHost,
// OOBE and some screens (camera, recovery) controller.
scoped_ptr<WizardController> wizard_controller_;
+ // Keeps views based OobeDisplay implementation if any.
+ // TODO(altimofeev): move it to ViewsLoginDisplayHost. Also see comment in
+ // the CreateWizardController().
+ scoped_ptr<ViewsOobeDisplay> oobe_display_;
+
DISALLOW_COPY_AND_ASSIGN(BaseLoginDisplayHost);
};
« no previous file with comments | « no previous file | chrome/browser/chromeos/login/base_login_display_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698