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

Unified Diff: chrome/browser/chromeos/status/status_area_view_chromeos.h

Issue 8585031: [cros, Aura] Make screen_mode static variable in StatusAreaViewChromeos (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 9 years, 1 month 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/status/status_area_view_chromeos.h
diff --git a/chrome/browser/chromeos/status/status_area_view_chromeos.h b/chrome/browser/chromeos/status/status_area_view_chromeos.h
index 614103c23e992a1c16f6e4e1e583efc64caaee5a..3e0fe440f774737e15be0e6a389d265f111e5c5d 100644
--- a/chrome/browser/chromeos/status/status_area_view_chromeos.h
+++ b/chrome/browser/chromeos/status/status_area_view_chromeos.h
@@ -22,16 +22,30 @@ class StatusAreaViewChromeos : public StatusAreaView,
public:
// The type of screen the host window is on.
enum ScreenMode {
- LOGIN_MODE_VIEWS, // The host is for the views-based OOBE/login screens.
LOGIN_MODE_WEBUI, // The host is for the WebUI OOBE/login screens.
BROWSER_MODE, // The host is for browser.
SCREEN_LOCKER_MODE, // The host is for screen locker.
};
+ // True if the browser is visible (i.e. not login/OOBE).
+ static bool IsBrowserMode();
+
+ // True if not logged in into user session (i.e. login/OOBE).
+ // It's not always !IsBrowserMode() as there's SCREEN_LOCKER_MODE which
+ // is inside user session, using login host and browser is not available.
+ static bool IsLoginMode();
+
+ // True if user is logged in but browser session is not available
+ // as screen lock is active.
+ static bool IsScreenLockMode();
+
+ // Sets current screen mode.
+ static void SetScreenMode(ScreenMode mode);
+
explicit StatusAreaViewChromeos();
virtual ~StatusAreaViewChromeos();
- void Init(StatusAreaButton::Delegate* delegate, ScreenMode screen_mode);
+ void Init(StatusAreaButton::Delegate* delegate);
// PowerManagerClient::Observer:
virtual void SystemResumed() OVERRIDE;
@@ -47,10 +61,12 @@ class StatusAreaViewChromeos : public StatusAreaView,
// by this method.
static void AddChromeosButtons(StatusAreaView* status_area,
StatusAreaButton::Delegate* delegate,
- ScreenMode screen_mode,
ClockMenuButton** clock_button);
private:
+ // Current screen mode of the status area.
+ static ScreenMode screen_mode_;
+
void UpdateClockText();
DISALLOW_COPY_AND_ASSIGN(StatusAreaViewChromeos);
« no previous file with comments | « chrome/browser/chromeos/status/network_menu_button.cc ('k') | chrome/browser/chromeos/status/status_area_view_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698