[cros, Aura] Make screen_mode static variable in StatusAreaViewChromeos

chrome/browser/chromeos/status/status_area_view_chromeos.h

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 82af1a2ae9c7d31f5191870f43a0ab6b80544a76..4ecf9df8496fd2bd74ab1d34bbe19ebb0b97548a 100644
--- a/chrome/browser/chromeos/status/status_area_view_chromeos.h
+++ b/chrome/browser/chromeos/status/status_area_view_chromeos.h
@@ -22,16 +22,26 @@ 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.
   };
 
+  // Current screen mode of the status area.
+  static ScreenMode screen_mode;

[stevenjb, 2011/11/21 18:10:16]

We should not expose this publicly. Instead add SetScreenMode(). I don't think
we need a getter with the two methods below, but we can add one or another
Is...() if we need to. (We may want to add IsScreenLockerMode for completeness
even if we don't currently need it).

[Nikita (slow), 2011/11/22 09:01:28]

Done.

+
+  // 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();
+
   explicit StatusAreaViewChromeos();
   virtual ~StatusAreaViewChromeos();
 
-  void Init(StatusAreaButton::Delegate* delegate, ScreenMode screen_mode);
+  void Init(StatusAreaButton::Delegate* delegate);
 
   // PowerLibrary::Observer:
   virtual void SystemResumed() OVERRIDE;
@@ -47,7 +57,6 @@ class StatusAreaViewChromeos : public StatusAreaView,
   // by this method.
   static void AddChromeosButtons(StatusAreaView* status_area,
                                  StatusAreaButton::Delegate* delegate,
-                                 ScreenMode screen_mode,
                                  ClockMenuButton** clock_button);
 
  private: