Fix regression where the active window header was not used for apps on CrOS

ui/views/window/non_client_view.h

 // 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.
 
 #ifndef UI_VIEWS_WINDOW_NON_CLIENT_VIEW_H_
 #define UI_VIEWS_WINDOW_NON_CLIENT_VIEW_H_
 
 #include "ui/views/view.h"
 
 namespace gfx {
 class Path;
 }
 
 namespace views {
 
 class ClientView;
 
 ////////////////////////////////////////////////////////////////////////////////
 // NonClientFrameView
 //
 //  An object that subclasses NonClientFrameView is a View that renders and
 //  responds to events within the frame portions of the non-client area of a
 //  window. This view does _not_ contain the ClientView, but rather is a sibling
 //  of it.
 class VIEWS_EXPORT NonClientFrameView : public View {
  public:
   // Internal class name.
   static const char kViewClassName[];
 
+  virtual ~NonClientFrameView();

[sky, 2014/01/06 19:13:49]

nit: after enum.

+
   enum {
     // Various edges of the frame border have a 1 px shadow along their edges;
     // in a few cases we shift elements based on this amount for visual appeal.
     kFrameShadowThickness = 1,
 
     // In restored mode, we draw a 1 px edge around the content area inside the
     // frame border.
     kClientEdgeThickness = 1,
   };
 
   // Sets whether the window should be rendered as active regardless of the
   // actual active state. Used when bubbles become active to make their parent
   // appear active. A value of true makes the window render as active always,
   // false gives normal behavior.
   void SetInactiveRenderingDisabled(bool disable);
 
+  // Used to determine if the frame should be painted as active. Keyed off the
+  // window's actual active state and |inactive_rendering_disabled_|.
+  bool ShouldPaintAsActive() const;
+
   // Helper for non-client view implementations to determine which area of the
   // window border the specified |point| falls within. The other parameters are
   // the size of the sizing edges, and whether or not the window can be
   // resized.
   int GetHTComponentForFrame(const gfx::Point& point,
                              int top_resize_border_height,
                              int resize_border_thickness,
                              int top_resize_corner_height,
                              int resize_corner_width,
                              bool can_resize);
@@ skipping 17 matching lines @@
   virtual void UpdateWindowTitle() = 0;
 
   // Overridden from View:
   virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
   virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
   virtual const char* GetClassName() const OVERRIDE;
 
  protected:
   virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
 
-  NonClientFrameView() : paint_as_active_(false) {}
-
-  // Used to determine if the frame should be painted as active. Keyed off the
-  // window's actual active state and the override, see
-  // SetInactiveRenderingDisabled() above.
-  bool ShouldPaintAsActive() const;
-
-  // Invoked from SetInactiveRenderingDisabled(). This implementation invokes
-  // SchedulesPaint as necessary.
-  virtual void ShouldPaintAsActiveChanged();
+  NonClientFrameView();
 
  private:
-  // True when the non-client view should always be rendered as if the window
-  // were active, regardless of whether or not the top level window actually
-  // is active.
-  bool paint_as_active_;
+  // Prevents the non-client frame view from being rendered as inactive when
+  // true.
+  bool inactive_rendering_disabled_;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
 // NonClientView
 //
 //  The NonClientView is the logical root of all Views contained within a
 //  Window, except for the RootView which is its parent and of which it is the
 //  sole child. The NonClientView has two children, the NonClientFrameView which
 //  is responsible for painting and responding to events from the non-client
 //  portions of the window, and the ClientView, which is responsible for the
@@ skipping 50 matching lines @@
   // Called by the containing Window when it is closed.
   void WindowClosing();
 
   // Replaces the frame view with a new one. Used when switching window theme
   // or frame style.
   void UpdateFrame();
 
   // Prevents the window from being rendered as deactivated when |disable| is
   // true, until called with |disable| false. Used when a sub-window is to be
   // shown that shouldn't visually de-activate the window.
-  // Subclasses can override this to perform additional actions when this value
-  // changes.
   void SetInactiveRenderingDisabled(bool disable);
 
   // Returns the bounds of the window required to display the content area at
   // the specified bounds.
   gfx::Rect GetWindowBoundsForClientBounds(const gfx::Rect client_bounds) const;
 
   // Determines the windows HT* code when the mouse cursor is at the
   // specified point, in window coordinates.
   int NonClientHitTest(const gfx::Point& point);
 
@@ skipping 63 matching lines @@
 
   // The accessible name of this view.
   base::string16 accessible_name_;
 
   DISALLOW_COPY_AND_ASSIGN(NonClientView);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_WINDOW_NON_CLIENT_VIEW_H_