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

ui/views/window/non_client_view.h

Index: ui/views/window/non_client_view.h
diff --git a/ui/views/window/non_client_view.h b/ui/views/window/non_client_view.h
index ecfe984bcac6ce3264e1358fed454915983920bf..a0f63468475774b7c7d86aa5639f657178953dd8 100644
--- a/ui/views/window/non_client_view.h
+++ b/ui/views/window/non_client_view.h
@@ -27,6 +27,8 @@ class VIEWS_EXPORT NonClientFrameView : public View {
   // 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.
@@ -43,6 +45,10 @@ class VIEWS_EXPORT NonClientFrameView : public View {
   // 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
@@ -80,22 +86,12 @@ class VIEWS_EXPORT NonClientFrameView : public View {
  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_;
 };
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -166,8 +162,6 @@ class VIEWS_EXPORT NonClientView : public View {
   // 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