[cros, Aura] Make screen_mode static variable in StatusAreaViewChromeos

chrome/browser/chromeos/login/webui_login_view.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/webui_login_view.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
@@ skipping 206 matching lines @@
     status_area_visibility_on_init_ = visible;
 }
 
 // WebUILoginView protected: ---------------------------------------------------
 
 void WebUILoginView::Layout() {
   DCHECK(webui_login_);
   webui_login_->SetBoundsRect(bounds());
 }
 
+void WebUILoginView::OnLocaleChanged() {
+  // Proxy settings dialog contains localized strings.
+  proxy_settings_dialog_.reset();
+  SchedulePaint();
+}
+
 void WebUILoginView::ChildPreferredSizeChanged(View* child) {
   Layout();
   SchedulePaint();
 }
 
 // Overridden from StatusAreaButton::Delegate:
 
 bool WebUILoginView::ShouldExecuteStatusAreaCommand(
     const views::View* button_view, int command_id) const {
   if (command_id == StatusAreaButton::Delegate::SHOW_NETWORK_OPTIONS)
     return true;
   return false;
 }
 
 void WebUILoginView::ExecuteStatusAreaCommand(
     const views::View* button_view, int command_id) {
   if (command_id == StatusAreaButton::Delegate::SHOW_NETWORK_OPTIONS) {
     if (proxy_settings_dialog_.get() == NULL) {
-      proxy_settings_dialog_.reset(new ProxySettingsDialog(
-          this, GetNativeWindow()));
+      proxy_settings_dialog_.reset(new ProxySettingsDialog(NULL,
+                                                           GetNativeWindow()));
     }
     proxy_settings_dialog_->Show();
   }
 }
 
 gfx::Font WebUILoginView::GetStatusAreaFont(const gfx::Font& font) const {
   return font;
 }
 
 StatusAreaButton::TextStyle WebUILoginView::GetStatusAreaTextStyle() const {
   return StatusAreaButton::GRAY_PLAIN;
 }
 
 void WebUILoginView::ButtonVisibilityChanged(views::View* button_view) {
   status_area_->UpdateButtonVisibility();
 }
 
-// Overridden from LoginHtmlDialog::Delegate:
-
-void WebUILoginView::OnDialogClosed() {
-}
-
-void WebUILoginView::OnLocaleChanged() {
-  // Proxy settings dialog contains localized strings.
-  proxy_settings_dialog_.reset();
-  SchedulePaint();
-}
-
 void WebUILoginView::OnRenderHostCreated(RenderViewHost* host) {
   new SnifferObserver(host, GetWebUI());
 }
 
 void WebUILoginView::OnTabMainFrameLoaded() {
   VLOG(1) << "WebUI login main frame loaded.";
 }
 
 void WebUILoginView::OnTabMainFrameFirstRender() {
   VLOG(1) << "WebUI login main frame rendered.";
+  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)
   InitStatusArea();
 #endif
 
 #if defined(TOOLKIT_USES_GTK)
   if (host_window_frozen_) {
     host_window_frozen_ = false;
@@ skipping 19 matching lines @@
   OobeUI* oobe_ui = static_cast<OobeUI*>(GetWebUI());
   // Notify OOBE that the login frame has been rendered. Currently
   // this is used to start camera presence check.
   oobe_ui->OnLoginPromptVisible();
 }
 
 void WebUILoginView::InitStatusArea() {
   DCHECK(status_area_ == NULL);
   DCHECK(status_window_ == NULL);
   status_area_ = new StatusAreaViewChromeos();
-  status_area_->Init(this, StatusAreaViewChromeos::LOGIN_MODE_WEBUI);
+  status_area_->Init(this);
   status_area_->SetVisible(status_area_visibility_on_init_);
 
   // Width of |status_window| is meant to be large enough.
   // The current value of status_area_->GetPreferredSize().width()
   // will be too small when button status is changed.
   // (e.g. when CapsLock indicator appears)
   gfx::Size widget_size(width()/2,
                         status_area_->GetPreferredSize().height());
   const int widget_x = base::i18n::IsRTL() ?
       kStatusAreaCornerPadding :
@@ skipping 70 matching lines @@
   // when the focus is inside an iframe. Only clear on KeyDown to prevent hiding
   // an immediate authentication error (See crbug.com/103643).
   if (event.type == WebKit::WebInputEvent::KeyDown) {
     WebUI* web_ui = GetWebUI();
     if (web_ui)
       web_ui->CallJavascriptFunction("cr.ui.Oobe.clearErrors");
   }
 }
 
 }  // namespace chromeos