Disabled transparency for header bars on the signin screen.

chrome/browser/chromeos/login/webui_login_display_host.cc

 // Copyright (c) 2012 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_display_host.h"
 
 #include "ash/ash_switches.h"
 #include "ash/desktop_background/user_wallpaper_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_animations.h"
+#include "ash/wm/window_properties.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "base/values.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/login/oobe_display.h"
 #include "chrome/browser/chromeos/login/webui_login_display.h"
 #include "chrome/browser/chromeos/login/webui_login_view.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_ui.h"
 #include "ui/aura/env.h"
+#include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/views/widget/widget.h"
 
 namespace chromeos {
 
 namespace {
 
 // URL which corresponds to the login WebUI.
 const char kLoginURL[] = "chrome://oobe/login";
 // URL which corresponds to the OOBE WebUI.
@@ skipping 89 matching lines @@
                    content::NotificationService::AllSources());
   }
   LOG(INFO) << "Login WebUI >> "
             << "zero_delay: " << zero_delay_enabled
             << " wait_for_wp_load_: " << waiting_for_wallpaper_load_
             << " wait_for_pods_: " << waiting_for_user_pods_
             << " init_webui_hidden_: " << initialize_webui_hidden_;
 }
 
 WebUILoginDisplayHost::~WebUILoginDisplayHost() {
-  if (login_window_)
-    login_window_->Close();
+  ResetLoginWindowAndView();
 }
 
 // LoginDisplayHost implementation ---------------------------------------------
 
 LoginDisplay* WebUILoginDisplayHost::CreateLoginDisplay(
     LoginDisplay::Delegate* delegate) {
   webui_login_display_ = new WebUILoginDisplay(delegate);
   webui_login_display_->set_background_bounds(background_bounds());
   return webui_login_display_;
 }
@@ skipping 70 matching lines @@
     SetStatusAreaVisible(false);
 }
 
 void WebUILoginDisplayHost::OnPreferencesChanged() {
   if (is_showing_login_)
     webui_login_display_->OnPreferencesChanged();
 }
 
 void WebUILoginDisplayHost::OnBrowserCreated() {
   // Close lock window now so that the launched browser can receive focus.
-  if (login_window_) {
-    login_window_->Close();
-    login_window_ = NULL;
-    login_view_ = NULL;
-  }
+  ResetLoginWindowAndView();
 }
 
 void WebUILoginDisplayHost::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED == type) {
     LOG(INFO) << "Login WebUI >> wp animation done";
     is_wallpaper_loaded_ = true;
     ash::Shell::GetInstance()->user_wallpaper_delegate()->
@@ skipping 23 matching lines @@
     }
     registrar_.Remove(this,
                       chrome::NOTIFICATION_LOGIN_WEBUI_VISIBLE,
                       content::NotificationService::AllSources());
   } else {
     BaseLoginDisplayHost::Observe(type, source, details);
   }
 }
 
 void WebUILoginDisplayHost::LoadURL(const GURL& url) {
-  if (!login_window_) {
-    views::Widget::InitParams params(
-        views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
-    params.bounds = background_bounds();
-    params.show_state = ui::SHOW_STATE_FULLSCREEN;
-    if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableNewOobe))
-      params.transparent = true;
-    params.parent =
-        ash::Shell::GetContainer(
-            ash::Shell::GetPrimaryRootWindow(),
-            ash::internal::kShellWindowId_LockScreenContainer);
-
-    login_window_ = new views::Widget;
-    login_window_->Init(params);
-    login_view_ = new WebUILoginView();
-
-    login_view_->Init(login_window_);
-
-    views::corewm::SetWindowVisibilityAnimationDuration(
-        login_window_->GetNativeView(),
-        base::TimeDelta::FromMilliseconds(kLoginFadeoutTransitionDurationMs));
-    views::corewm::SetWindowVisibilityAnimationTransition(
-        login_window_->GetNativeView(),
-        views::corewm::ANIMATE_HIDE);
-
-    login_window_->SetContentsView(login_view_);
-    login_view_->UpdateWindowType();
-
-    // If WebUI is initialized in hidden state, show it only if we're no
-    // longer waiting for wallpaper animation/user images loading. Otherwise,
-    // always show it.
-    if (!initialize_webui_hidden_ ||
-        (!waiting_for_wallpaper_load_ && !waiting_for_user_pods_)) {
-      LOG(INFO) << "Login WebUI >> show login wnd on create";
-      login_window_->Show();
-    } else {
-      LOG(INFO) << "Login WebUI >> login wnd is hidden on create";
-      login_view_->set_is_hidden(true);
-    }
-    login_window_->GetNativeView()->SetName("WebUILoginView");
-    login_view_->OnWindowCreated();
-  }
+  InitLoginWindowAndView();
   // Subscribe to crash events.
   content::WebContentsObserver::Observe(login_view_->GetWebContents());
   login_view_->LoadURL(url);
 }
 
 void WebUILoginDisplayHost::RenderViewGone(base::TerminationStatus status) {
   // Do not try to restore on shutdown
   if (browser_shutdown::GetShutdownType() != browser_shutdown::NOT_VALID)
     return;
 
@@ skipping 65 matching lines @@
       break;
     case RESTORE_SIGN_IN:
       StartSignInScreen();
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
+void WebUILoginDisplayHost::InitLoginWindowAndView() {
+  if (login_window_)
+    return;
+
+  views::Widget::InitParams params(
+      views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
+  params.bounds = background_bounds();
+  params.show_state = ui::SHOW_STATE_FULLSCREEN;
+  if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDisableNewOobe))
+    params.transparent = true;
+  params.parent =
+      ash::Shell::GetContainer(
+          ash::Shell::GetPrimaryRootWindow(),
+          ash::internal::kShellWindowId_LockScreenContainer);
+
+  login_window_ = new views::Widget;
+  login_window_->Init(params);
+  if (login_window_->GetNativeWindow()) {
+    aura::RootWindow* root = login_window_->GetNativeWindow()->GetRootWindow();
+    if (root)
+      root->SetProperty(ash::internal::kIgnoreSoloWindowPolicy, true);

[Nikita (slow), 2012/12/27 15:22:19]

nit: Save previous value and then restore it?

[ygorshenin1, 2012/12/27 15:37:35]

Done.

+  }
+  login_view_ = new WebUILoginView();
+
+  login_view_->Init(login_window_);
+
+  views::corewm::SetWindowVisibilityAnimationDuration(
+      login_window_->GetNativeView(),
+      base::TimeDelta::FromMilliseconds(kLoginFadeoutTransitionDurationMs));
+  views::corewm::SetWindowVisibilityAnimationTransition(
+      login_window_->GetNativeView(),
+      views::corewm::ANIMATE_HIDE);
+
+  login_window_->SetContentsView(login_view_);
+  login_view_->UpdateWindowType();
+
+  // If WebUI is initialized in hidden state, show it only if we're no
+  // longer waiting for wallpaper animation/user images loading. Otherwise,
+  // always show it.
+  if (!initialize_webui_hidden_ ||
+      (!waiting_for_wallpaper_load_ && !waiting_for_user_pods_)) {
+    LOG(INFO) << "Login WebUI >> show login wnd on create";
+    login_window_->Show();
+  } else {
+    LOG(INFO) << "Login WebUI >> login wnd is hidden on create";
+    login_view_->set_is_hidden(true);
+  }
+  login_window_->GetNativeView()->SetName("WebUILoginView");
+  login_view_->OnWindowCreated();
+}
+
+void WebUILoginDisplayHost::ResetLoginWindowAndView() {
+  if (!login_window_)
+    return;
+
+  if (login_window_->GetNativeWindow()) {
+    aura::RootWindow* root = login_window_->GetNativeWindow()->GetRootWindow();
+    if (root)
+      root->SetProperty(ash::internal::kIgnoreSoloWindowPolicy, false);
+  }
+  login_window_->Close();
+  login_window_ = NULL;
+  login_view_ = NULL;
+}
+
 }  // namespace chromeos