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

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

Issue 2566443005: cros: Replace WizardController string constants with OobeScreen values. (Closed)
Patch Set: Address comments Created 3 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
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 ca76b0d2686014ab7a264e680fe6680b3ea9f52d..0536866e25e6d4647b7ffc36372b4249d33d368b 100644
--- a/chrome/browser/chromeos/login/screens/base_screen.h
+++ b/chrome/browser/chromeos/login/screens/base_screen.h
@@ -9,6 +9,7 @@
#include "base/gtest_prod_util.h"
#include "base/macros.h"
+#include "chrome/browser/chromeos/login/oobe_screen.h"
#include "chrome/browser/chromeos/login/screens/base_screen_delegate.h"
#include "components/login/base_screen_handler_utils.h"
#include "components/login/screens/screen_context.h"
@@ -29,7 +30,7 @@ class ModelViewChannel;
class BaseScreen {
public:
explicit BaseScreen(BaseScreenDelegate* base_screen_delegate,
- const std::string& screen_id);
+ OobeScreen screen_id);
virtual ~BaseScreen();
// ---- Old implementation ----
@@ -63,7 +64,7 @@ class BaseScreen {
virtual bool IsStatusAreaDisplayed();
// Returns the identifier of the screen.
- const std::string& screen_id() const { return screen_id_; }
+ OobeScreen screen_id() const { return screen_id_; }
// Called when user action event with |event_id|
// happened. Notification about this event comes from the JS
@@ -151,7 +152,7 @@ class BaseScreen {
BaseScreenDelegate* base_screen_delegate_ = nullptr;
- const std::string screen_id_;
+ const OobeScreen screen_id_;
DISALLOW_COPY_AND_ASSIGN(BaseScreen);
};

Powered by Google App Engine
This is Rietveld 408576698