Override status area window type for WebUI lock screen.

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 324 matching lines @@
   // (e.g. when CapsLock indicator appears)
   gfx::Size widget_size(width()/2,
                         status_area_->GetPreferredSize().height());
   const int widget_x = base::i18n::IsRTL() ?
       kStatusAreaCornerPadding :
       width() - widget_size.width() - kStatusAreaCornerPadding;
   gfx::Rect widget_bounds(widget_x, kStatusAreaCornerPadding,
                           widget_size.width(), widget_size.height());
   // TODO(nkostylev|oshima): Make status area in the same window as
   // |webui_login_| once RenderWidgetHostViewViews and compositor are
-  // ready.
-  views::Widget::InitParams widget_params(
-      views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
+  // ready. This will also avoid having to override the status area
+  // widget type for the lock screen.
+  views::Widget::InitParams widget_params(GetStatusAreaWidgetType());
   widget_params.bounds = widget_bounds;
   widget_params.transparent = true;
   widget_params.parent_widget = login_window_;
   status_window_ = new views::Widget;
   status_window_->Init(widget_params);
 
 #if defined(TOOLKIT_USES_GTK)
+  std::vector<int> params;
+  params.push_back(1);  // Show while screen is locked.
   chromeos::WmIpc::instance()->SetWindowType(
       status_window_->GetNativeView(),
       chromeos::WM_IPC_WINDOW_CHROME_INFO_BUBBLE,
-      NULL);
+      &params);
 #endif
 
   views::View* contents_view = new RightAlignedView;
   contents_view->AddChildView(status_area_);
   status_window_->SetContentsView(contents_view);
   status_window_->Show();
 }
 
+views::Widget::InitParams::Type WebUILoginView::GetStatusAreaWidgetType() {
+  return views::Widget::InitParams::TYPE_WINDOW_FRAMELESS;
+}
+
 // WebUILoginView private: -----------------------------------------------------
 
 bool WebUILoginView::HandleContextMenu(const ContextMenuParams& params) {
   // Do not show the context menu.
 #ifndef NDEBUG
   return false;
 #else
   return true;
 #endif
 }
@@ skipping 28 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