Replace kIgnoreSoloWindowFramePointerPolicy with global flag

chrome/browser/chromeos/login/login_display_host_impl.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/login_display_host_impl.h"
 
 #include <vector>
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #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"
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
@@ skipping 29 matching lines @@
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "chromeos/ime/input_method_manager.h"
 #include "chromeos/login/login_state.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #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"
 #include "ui/compositor/layer.h"
 #include "ui/compositor/layer_animation_element.h"
 #include "ui/compositor/layer_animation_sequence.h"
 #include "ui/compositor/layer_animator.h"
 #include "ui/compositor/scoped_layer_animation_settings.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/transform.h"
@@ skipping 93 matching lines @@
       shutting_down_(false),
       oobe_progress_bar_visible_(false),
       session_starting_(false),
       login_window_(NULL),
       login_view_(NULL),
       webui_login_display_(NULL),
       is_showing_login_(false),
       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
   // browser instance that will block the shutdown.
   registrar_.Add(this,
                  chrome::NOTIFICATION_CLOSE_ALL_BROWSERS_REQUEST,
                  content::NotificationService::AllSources());
 
   // NOTIFICATION_BROWSER_OPENED is issued after browser is created, but
   // not shown yet. Lock window has to be closed at this point so that
@@ skipping 575 matching lines @@
       break;
     default:
       NOTREACHED();
       break;
   }
 }
 
 void LoginDisplayHostImpl::InitLoginWindowAndView() {
   if (login_window_)
     return;
+  ash::FramePainter::SetSoloWindowHeaderEnabled(false);
 
   views::Widget::InitParams params(
       views::Widget::InitParams::TYPE_WINDOW_FRAMELESS);
   params.bounds = background_bounds();
   params.show_state = ui::SHOW_STATE_FULLSCREEN;
   params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   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) {
-      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(
       login_window_->GetNativeView(),
       base::TimeDelta::FromMilliseconds(kLoginFadeoutTransitionDurationMs));
   views::corewm::SetWindowVisibilityAnimationTransition(
       login_window_->GetNativeView(),
       views::corewm::ANIMATE_HIDE);
 
   login_window_->SetContentsView(login_view_);
 
   // 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(WARNING) << "Login WebUI >> show login wnd on create";
     login_window_->Show();
   } else {
     LOG(WARNING) << "Login WebUI >> login wnd is hidden on create";
     login_view_->set_is_hidden(true);
   }
   login_window_->GetNativeView()->SetName("WebUILoginView");
 }
 
 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;
 }
 
 bool LoginDisplayHostImpl::IsRunningUserAdding() {
   return restore_path_ == RESTORE_ADD_USER_INTO_SESSION;
 }
 
 void LoginDisplayHostImpl::OnAuthPrewarmDone() {
@@ skipping 140 matching lines @@
   VLOG(1) << "Initial time zone: " << timezone_name;
   // Apply locale customizations only once to preserve whatever locale
   // user has changed to during OOBE.
   if (!timezone_name.empty()) {
     chromeos::system::TimezoneSettings::GetInstance()->SetTimezoneFromID(
         UTF8ToUTF16(timezone_name));
   }
 }
 
 }  // namespace chromeos