Introduce RootWindowProperty for RootWindow's properties

ash/wm/frame_painter.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 "ash/wm/frame_painter.h"
 
 #include <vector>
 
 #include "ash/ash_constants.h"
 #include "ash/root_window_controller.h"
+#include "ash/root_window_settings.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/window_properties.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm/workspace/frame_caption_button_container_view.h"
 #include "base/logging.h"  // DCHECK
 #include "grit/ash_resources.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
@@ skipping 727 matching lines @@
 
 bool FramePainter::UseSoloWindowHeader() const {
   // Don't use transparent headers for panels, pop-ups, etc.
   if (!IsSoloWindowHeaderCandidate(window_))
     return false;
   aura::RootWindow* root = window_->GetRootWindow();
   if (!root || root->GetProperty(internal::kIgnoreSoloWindowFramePainterPolicy))
     return false;
   // Don't recompute every time, as it would require many window property
   // lookups.
-  return root->GetProperty(internal::kSoloWindowHeaderKey);
+  return internal::GetRootWindowSettings(root)->solo_window_header;
 }
 
 // static
 bool FramePainter::UseSoloWindowHeaderInRoot(RootWindow* root_window,
                                              Window* ignore_window) {
   int visible_window_count = 0;
   std::vector<Window*> windows = GetWindowsForSoloHeaderUpdate(root_window);
   for (std::vector<Window*>::const_iterator it = windows.begin();
        it != windows.end();
        ++it) {
@@ skipping 18 matching lines @@
 void FramePainter::UpdateSoloWindowInRoot(RootWindow* root,
                                           Window* ignore_window) {
 #if defined(OS_WIN)
   // Non-Ash Windows doesn't do solo-window counting for transparency effects,
   // as the desktop background and window frames are managed by the OS.
   if (!ash::Shell::HasInstance())
     return;
 #endif
   if (!root)
     return;
-  bool old_solo_header = root->GetProperty(internal::kSoloWindowHeaderKey);
+  internal::RootWindowSettings* root_window_settings =
+      internal::GetRootWindowSettings(root);
+  bool old_solo_header = root_window_settings->solo_window_header;
   bool new_solo_header = UseSoloWindowHeaderInRoot(root, ignore_window);
   if (old_solo_header == new_solo_header)
     return;
-  root->SetProperty(internal::kSoloWindowHeaderKey, new_solo_header);
+  root_window_settings->solo_window_header = new_solo_header;
+
   // Invalidate all the window frames in the desktop. There should only be
   // a few.
   std::vector<Window*> windows = GetWindowsForSoloHeaderUpdate(root);
   for (std::vector<Window*>::const_iterator it = windows.begin();
        it != windows.end();
        ++it) {
     Widget* widget = Widget::GetWidgetForNativeWindow(*it);
     if (widget && widget->non_client_view())
       widget->non_client_view()->SchedulePaint();
   }
@@ skipping 14 matching lines @@
   // icon. Don't use |window_icon_| for this computation as it may be NULL.
   int title_y = GetCaptionButtonContainerCenterY() - title_font.GetHeight() / 2;
   return gfx::Rect(
       title_x,
       std::max(0, title_y),
       std::max(0, caption_button_container_->x() - kTitleLogoSpacing - title_x),
       title_font.GetHeight());
 }
 
 }  // namespace ash