Replace kIgnoreSoloWindowFramePointerPolicy with global flag

chrome/browser/chromeos/login/login_display_host_impl.cc

Index: chrome/browser/chromeos/login/login_display_host_impl.cc
diff --git a/chrome/browser/chromeos/login/login_display_host_impl.cc b/chrome/browser/chromeos/login/login_display_host_impl.cc
index 800193143d31402e10ddee70b4f34f37714ead3f..4d8c10dda1b63213de42d930b1c50fa76bbe51ad 100644
--- a/chrome/browser/chromeos/login/login_display_host_impl.cc
+++ b/chrome/browser/chromeos/login/login_display_host_impl.cc
@@ -10,7 +10,7 @@
 #include "ash/desktop_background/user_wallpaper_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
-#include "ash/wm/window_properties.h"
+#include "ash/wm/frame_painter.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
@@ -60,7 +60,6 @@
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/browser/web_ui.h"
-#include "ui/aura/root_window.h"
 #include "ui/aura/window.h"
 #include "ui/base/events/event_utils.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -174,8 +173,7 @@ LoginDisplayHostImpl::LoginDisplayHostImpl(const gfx::Rect& background_bounds)
       is_wallpaper_loaded_(false),
       status_area_saved_visibility_(false),
       crash_count_(0),
-      restore_path_(RESTORE_UNKNOWN),
-      old_ignore_solo_window_frame_painter_policy_value_(false) {
+      restore_path_(RESTORE_UNKNOWN) {
   // We need to listen to CLOSE_ALL_BROWSERS_REQUEST but not APP_TERMINATING
   // because/ APP_TERMINATING will never be fired as long as this keeps
   // ref-count. CLOSE_ALL_BROWSERS_REQUEST is safe here because there will be no
@@ -771,6 +769,7 @@ void LoginDisplayHostImpl::StartPostponedWebUI() {
 void LoginDisplayHostImpl::InitLoginWindowAndView() {
   if (login_window_)
     return;
+  ash::FramePainter::SetSoloWindowHeaderEnabled(false);
 
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
@@ -784,17 +783,7 @@ void LoginDisplayHostImpl::InitLoginWindowAndView() {
 
   login_window_ = new views::Widget;
   login_window_->Init(params);
-  if (login_window_->GetNativeWindow()) {
-    aura::RootWindow* root = login_window_->GetNativeWindow()->GetRootWindow();
-    if (root) {
-      old_ignore_solo_window_frame_painter_policy_value_ =
-          root->GetProperty(ash::internal::kIgnoreSoloWindowFramePainterPolicy);
-      root->SetProperty(ash::internal::kIgnoreSoloWindowFramePainterPolicy,
-                        true);
-    }
-  }
   login_view_ = new WebUILoginView();
-
   login_view_->Init();
 
   views::corewm::SetWindowVisibilityAnimationDuration(
@@ -823,14 +812,7 @@ void LoginDisplayHostImpl::InitLoginWindowAndView() {
 void LoginDisplayHostImpl::ResetLoginWindowAndView() {
   if (!login_window_)
     return;
-
-  if (login_window_->GetNativeWindow()) {
-    aura::RootWindow* root = login_window_->GetNativeWindow()->GetRootWindow();
-    if (root) {
-      root->SetProperty(ash::internal::kIgnoreSoloWindowFramePainterPolicy,
-                        old_ignore_solo_window_frame_painter_policy_value_);
-    }
-  }
+  ash::FramePainter::SetSoloWindowHeaderEnabled(true);
   login_window_->Close();
   login_window_ = NULL;
   login_view_ = NULL;