Replace kIgnoreSoloWindowFramePointerPolicy with global flag

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"
@@ skipping 58 matching lines @@
 // right relative to the header.  Now that we have removed the left edge frame
 // we need to copy the theme image for the window header from a few pixels
 // inset to preserve alignment with the NTP image, or else we'll break a bunch
 // of existing themes.  We do something similar on OS X for the same reason.
 const int kThemeFrameImageInsetX = 5;
 // Duration of crossfade animation for activating and deactivating frame.
 const int kActivationCrossfadeDurationMs = 200;
 // Alpha/opacity value for fully-opaque headers.
 const int kFullyOpaque = 255;
 
+// A flag to enable/disable solo window header.
+bool solo_window_header_enabled = true;
+
 // Tiles an image into an area, rounding the top corners. Samples |image|
 // starting |image_inset_x| pixels from the left of the image.
 void TileRoundRect(gfx::Canvas* canvas,
                    const gfx::ImageSkia& image,
                    const SkPaint& paint,
                    const gfx::Rect& bounds,
                    int top_left_corner_radius,
                    int top_right_corner_radius,
                    int image_inset_x) {
   SkRect rect = gfx::RectToSkRect(bounds);
@@ skipping 180 matching lines @@
   // Watch for maximize/restore/fullscreen state changes.  Observer removes
   // itself in OnWindowDestroying() below, or in the destructor if we go away
   // before the window.
   window_->AddObserver(this);
 
   // Solo-window header updates are handled by the workspace controller when
   // this window is added to the desktop.
 }
 
 // static
+void FramePainter::SetSoloWindowHeadersEnabled(bool enabled) {
+  solo_window_header_enabled = enabled;
+}
+
+// static
 void FramePainter::UpdateSoloWindowHeader(RootWindow* root_window) {
   // Use a separate function here so callers outside of FramePainter don't need
   // to know about "ignorable_window".
   UpdateSoloWindowInRoot(root_window, NULL /* ignorable_window */);
 }
 
 gfx::Rect FramePainter::GetBoundsForClientView(
     int top_height,
     const gfx::Rect& window_bounds) const {
   return gfx::Rect(
@@ skipping 452 matching lines @@
   if (UseSoloWindowHeader())
     return kSoloWindowOpacity;
 
   // Otherwise, change transparency based on window activation status.
   if (header_mode == ACTIVE)
     return kActiveWindowOpacity;
   return kInactiveWindowOpacity;
 }
 
 bool FramePainter::UseSoloWindowHeader() const {
+  if (!solo_window_header_enabled)
+    return false;
   // 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 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);
@@ skipping 63 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