[cros, Aura] Change status area visibility during OOBE.

BUG=104133
TEST=During OOBE on Aura status area is only seen on login screen.


Review URL: http://codereview.chromium.org/8688003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112689 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/login/webui_login_view.cc

@@ -15,6 +15,7 @@
 #include "chrome/browser/chromeos/dbus/session_manager_client.h"
 #include "chrome/browser/chromeos/login/proxy_settings_dialog.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
+#include "chrome/browser/chromeos/status/status_area_view.h"
 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/views/dom_view.h"
@@ -35,6 +36,10 @@
 #include "chrome/browser/ui/virtual_keyboard/virtual_keyboard_manager.h"
 #endif
 
+#if defined(USE_AURA)
+#include "chrome/browser/ui/views/aura/chrome_shell_delegate.h"
+#endif
+
 namespace {
 
 const char kViewClassName[] = "browser/chromeos/login/WebUILoginView";
@@ -280,9 +285,10 @@ void WebUILoginView::OnTabMainFrameFirstRender() {
   StatusAreaViewChromeos::SetScreenMode(
       StatusAreaViewChromeos::LOGIN_MODE_WEBUI);
   // In aura there's a global status area shown already.
-  // TODO(nkostylev): Figure out how to communicate from login screen with
-  // global status area.
-#if !defined(USE_AURA)
+#if defined(USE_AURA)
+  status_area_ = ChromeShellDelegate::instance()->GetStatusArea();
+  status_area_->SetVisible(status_area_visibility_on_init_);
+#else
   InitStatusArea();
 #endif
 
@@ -317,8 +323,9 @@ void WebUILoginView::OnTabMainFrameFirstRender() {
 void WebUILoginView::InitStatusArea() {
   DCHECK(status_area_ == NULL);
   DCHECK(status_window_ == NULL);
-  status_area_ = new StatusAreaViewChromeos();
-  status_area_->Init(this);
+  StatusAreaViewChromeos* status_area_chromeos = new StatusAreaViewChromeos();
+  status_area_chromeos->Init(this);
+  status_area_ = status_area_chromeos;
   status_area_->SetVisible(status_area_visibility_on_init_);
 
   // Width of |status_window| is meant to be large enough.

chrome/browser/chromeos/login/webui_login_view.h

@@ -18,6 +18,7 @@
 
 class DOMView;
 class GURL;
+class StatusAreaView;
 class WebUI;
 
 namespace views {
@@ -27,8 +28,6 @@ class Widget;
 
 namespace chromeos {
 
-class StatusAreaViewChromeos;
-
 // View used to render a WebUI supporting Widget. This widget is used for the
 // WebUI based start up and lock screens. It contains a StatusAreaView and
 // DOMView.
@@ -95,7 +94,7 @@ class WebUILoginView : public views::WidgetDelegateView,
   // Creates and adds the status area (separate window).
   virtual void InitStatusArea();
 
-  StatusAreaViewChromeos* status_area_;
+  StatusAreaView* status_area_;
 
   // DOMView for rendering a webpage as a webui login.
   DOMView* webui_login_;

chrome/browser/chromeos/status/accessibility_menu_button_browsertest.cc

@@ -6,6 +6,7 @@
 
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/frame/browser_view.h"
+#include "chrome/browser/chromeos/status/status_area_view.h"
 #include "chrome/browser/chromeos/view_ids.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/browser/ui/browser.h"
@@ -25,7 +26,7 @@ class AccessibilityMenuButtonTest : public InProcessBrowserTest {
   const AccessibilityMenuButton* GetAccessibilityMenuButton() {
     const views::View* view =
 #if defined(USE_AURA)
-        ChromeShellDelegate::instance()->GetStatusAreaForTest();
+        ChromeShellDelegate::instance()->GetStatusArea();
 #else
         static_cast<BrowserView*>(browser()->window());
 #endif

chrome/browser/chromeos/status/caps_lock_menu_button_browsertest.cc

@@ -7,6 +7,7 @@
 #include "base/string_util.h"
 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
 #include "chrome/browser/chromeos/frame/browser_view.h"
+#include "chrome/browser/chromeos/status/status_area_view.h"
 #include "chrome/browser/chromeos/view_ids.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
@@ -32,7 +33,7 @@ class CapsLockMenuButtonTest : public CrosInProcessBrowserTest {
   const CapsLockMenuButton* GetCapsLockMenuButton() {
     const views::View* view =
 #if defined(USE_AURA)
-        ChromeShellDelegate::instance()->GetStatusAreaForTest();
+        ChromeShellDelegate::instance()->GetStatusArea();
 #else
         static_cast<BrowserView*>(browser()->window());
 #endif

chrome/browser/chromeos/status/clock_menu_button_browsertest.cc

@@ -7,6 +7,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/frame/browser_view.h"
+#include "chrome/browser/chromeos/status/status_area_view.h"
 #include "chrome/browser/chromeos/system/timezone_settings.h"
 #include "chrome/browser/chromeos/view_ids.h"
 #include "chrome/browser/prefs/pref_member.h"
@@ -34,7 +35,7 @@ class ClockMenuButtonTest : public InProcessBrowserTest {
   const ClockMenuButton* GetClockMenuButton() {
     const views::View* parent = NULL;
 #if defined(USE_AURA)
-    parent = ChromeShellDelegate::instance()->GetStatusAreaForTest();
+    parent = ChromeShellDelegate::instance()->GetStatusArea();
 #else
     parent = static_cast<const BrowserView*>(browser()->window());
 #endif

chrome/browser/chromeos/status/input_method_menu_button_browsertest.cc

@@ -7,6 +7,7 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/cros/cros_in_process_browser_test.h"
 #include "chrome/browser/chromeos/frame/browser_view.h"
+#include "chrome/browser/chromeos/status/status_area_view.h"
 #include "chrome/browser/chromeos/view_ids.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
@@ -32,7 +33,7 @@ class InputMethodMenuButtonTest : public CrosInProcessBrowserTest {
   const InputMethodMenuButton* GetInputMethodMenuButton() {
     const views::View* view =
 #if defined(USE_AURA)
-        ChromeShellDelegate::instance()->GetStatusAreaForTest();
+        ChromeShellDelegate::instance()->GetStatusArea();
 #else
         static_cast<BrowserView*>(browser()->window());
 #endif

chrome/browser/chromeos/status/power_menu_button_browsertest.cc

@@ -5,6 +5,7 @@
 #include "chrome/browser/chromeos/status/power_menu_button.h"
 
 #include "chrome/browser/chromeos/frame/browser_view.h"
+#include "chrome/browser/chromeos/status/status_area_view.h"
 #include "chrome/browser/chromeos/view_ids.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
@@ -28,7 +29,7 @@ class PowerMenuButtonTest : public InProcessBrowserTest {
   PowerMenuButton* GetPowerMenuButton() {
     views::View* view =
 #if defined(USE_AURA)
-        ChromeShellDelegate::instance()->GetStatusAreaForTest();
+        ChromeShellDelegate::instance()->GetStatusArea();
 #else
         static_cast<BrowserView*>(browser()->window());
 #endif

chrome/browser/chromeos/status/status_area_view_browsertest.cc

@@ -21,7 +21,7 @@ class StatusAreaViewTest : public InProcessBrowserTest {
   const StatusAreaView* GetStatusAreaView() {
     const views::View* view =
 #if defined(USE_AURA)
-        ChromeShellDelegate::instance()->GetStatusAreaForTest();
+        ChromeShellDelegate::instance()->GetStatusArea();
 #else
         static_cast<BrowserView*>(browser()->window());
 #endif

chrome/browser/ui/views/aura/chrome_shell_delegate.cc

@@ -24,8 +24,8 @@ ChromeShellDelegate::~ChromeShellDelegate() {
     instance_ = NULL;
 }
 
-views::View* ChromeShellDelegate::GetStatusAreaForTest() {
-  return status_area_host_->GetStatusAreaForTest();
+StatusAreaView* ChromeShellDelegate::GetStatusArea() {
+  return status_area_host_->GetStatusArea();
 }
 
 // static

chrome/browser/ui/views/aura/chrome_shell_delegate.h

@@ -14,6 +14,7 @@
 
 class Browser;
 class StatusAreaHostAura;
+class StatusAreaView;
 
 namespace views {
 class View;
@@ -26,7 +27,7 @@ class ChromeShellDelegate : public aura_shell::ShellDelegate {
 
   static ChromeShellDelegate* instance() { return instance_; }
 
-  views::View* GetStatusAreaForTest();
+  StatusAreaView* GetStatusArea();
 
   // Returns whether a launcher item should be created for |browser|. If an item
   // should be created |type| is set to the launcher type to create.

chrome/browser/ui/views/aura/status_area_host_aura.cc

@@ -34,7 +34,7 @@ StatusAreaHostAura::StatusAreaHostAura()
 StatusAreaHostAura::~StatusAreaHostAura() {
 }
 
-views::View* StatusAreaHostAura::GetStatusAreaForTest() {
+StatusAreaView* StatusAreaHostAura::GetStatusArea() {
   return status_area_view_;
 }
 

chrome/browser/ui/views/aura/status_area_host_aura.h

@@ -27,8 +27,8 @@ class StatusAreaHostAura : public StatusAreaButton::Delegate {
   StatusAreaHostAura();
   virtual ~StatusAreaHostAura();
 
-  // Returns the view housing the status area. Exposed for testing.
-  views::View* GetStatusAreaForTest();
+  // Returns the status area view.
+  StatusAreaView* GetStatusArea();
 
   // Instantiates and sets |status_area_view_|, and sets it as the contents of
   // a new views::Widget |status_area_widget_| which is returned.