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

Unified Diff: chrome/browser/chromeos/login/screens/base_screen.h

Issue 672203003: ScreenContext is moved to components/login. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 6 years, 2 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/DEPS ('k') | chrome/browser/chromeos/login/screens/base_screen.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/login/screens/base_screen.h
diff --git a/chrome/browser/chromeos/login/screens/base_screen.h b/chrome/browser/chromeos/login/screens/base_screen.h
index 05554511dc4080a804bee60262191da15cf5a4ae..30ecb31dd696e9e953208b33ef513c45973d2a44 100644
--- a/chrome/browser/chromeos/login/screens/base_screen.h
+++ b/chrome/browser/chromeos/login/screens/base_screen.h
@@ -14,9 +14,12 @@ namespace base {
class DictionaryValue;
}
+namespace login {
+class ScreenContext;
+}
+
namespace chromeos {
-class ScreenContext;
class ScreenObserver;
// Base class for the all OOBE/login/before-session screens.
@@ -50,7 +53,7 @@ class BaseScreen {
// at this point. Screen can alter context, resulting context will be passed
// to JS. This method will be called once per instance of the Screen object,
// unless |IsPermanent()| returns |true|.
- virtual void Initialize(ScreenContext* context);
+ virtual void Initialize(::login::ScreenContext* context);
// Called when screen appears.
virtual void OnShow();
@@ -99,7 +102,7 @@ class BaseScreen {
friend class ScreenManager;
friend class UpdateScreenTest;
- void SetContext(ScreenContext* context);
+ void SetContext(::login::ScreenContext* context);
ScreenObserver* screen_observer_;
« no previous file with comments | « chrome/browser/chromeos/login/DEPS ('k') | chrome/browser/chromeos/login/screens/base_screen.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698