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

Unified Diff: chrome/browser/chromeos/login/webui_login_view.cc

Issue 8770012: Override status area window type for WebUI lock screen. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Override the status area window type for the lock screen. Created 9 years 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/login/webui_login_view.cc
diff --git a/chrome/browser/chromeos/login/webui_login_view.cc b/chrome/browser/chromeos/login/webui_login_view.cc
index 976acbe000392133240d0792426f853f84da8e60..f756dfafef010184ce4d0000e898f2b63a6621a1 100644
--- a/chrome/browser/chromeos/login/webui_login_view.cc
+++ b/chrome/browser/chromeos/login/webui_login_view.cc
@@ -342,9 +342,9 @@ void WebUILoginView::InitStatusArea() {
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_;
@@ -352,10 +352,12 @@ void WebUILoginView::InitStatusArea() {
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;
@@ -364,6 +366,10 @@ void WebUILoginView::InitStatusArea() {
status_window_->Show();
}
+views::Widget::InitParams::Type WebUILoginView::GetStatusAreaWidgetType() {
+ return views::Widget::InitParams::TYPE_WINDOW_FRAMELESS;
+}
+
// WebUILoginView private: -----------------------------------------------------
bool WebUILoginView::HandleContextMenu(const ContextMenuParams& params) {
« no previous file with comments | « chrome/browser/chromeos/login/webui_login_view.h ('k') | chrome/browser/chromeos/login/webui_screen_locker.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698