Support inactive-styled GTK frame buttons

Please see the demo:
https://bugs.chromium.org/p/chromium/issues/detail?id=753067#c9

BUG=753067
R=erg@chromium.org,sky@chromium.org

Change-Id: Idfc5d9a37f73b22c35339140ad858f4615849556
Reviewed-on: https://chromium-review.googlesource.com/626856Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Elliot Glaysher <erg@chromium.org>
Commit-Queue: Thomas Anderson <thomasanderson@chromium.org>
Cr-Commit-Position: refs/heads/master@{#496492}

chrome/browser/ui/libgtkui/nav_button_provider_gtk3.cc

@@ -160,8 +160,12 @@ class NavButtonImageSource : public gfx::ImageSkiaSource {
  public:
   NavButtonImageSource(chrome::FrameButtonDisplayType type,
                        views::Button::ButtonState state,
+                       bool active,
                        gfx::Size button_size)
-      : type_(type), state_(state), button_size_(button_size) {}
+      : type_(type),
+        state_(state),
+        active_(active),
+        button_size_(button_size) {}
 
   ~NavButtonImageSource() override {}
 
@@ -176,6 +180,10 @@ class NavButtonImageSource : public gfx::ImageSkiaSource {
     gtk_style_context_add_class(button_context,
                                 ButtonStyleClassFromButtonType(type_));
     GtkStateFlags button_state = GtkStateFlagsFromButtonState(state_);
+    if (!active_) {
+      button_state =
+          static_cast<GtkStateFlags>(button_state | GTK_STATE_FLAG_BACKDROP);
+    }
     gtk_style_context_set_state(button_context, button_state);
 
     // Gtk doesn't support fractional scale factors, but chrome does.
@@ -225,6 +233,7 @@ class NavButtonImageSource : public gfx::ImageSkiaSource {
  private:
   chrome::FrameButtonDisplayType type_;
   views::Button::ButtonState state_;
+  bool active_;
   gfx::Size button_size_;
 };
 
@@ -234,7 +243,9 @@ NavButtonProviderGtk3::NavButtonProviderGtk3() {}
 
 NavButtonProviderGtk3::~NavButtonProviderGtk3() {}
 
-void NavButtonProviderGtk3::RedrawImages(int top_area_height, bool maximized) {
+void NavButtonProviderGtk3::RedrawImages(int top_area_height,
+                                         bool maximized,
+                                         bool active) {
   auto header_context =
       GetStyleContextFromCss("GtkHeaderBar#headerbar.header-bar.titlebar");
 
@@ -301,7 +312,8 @@ void NavButtonProviderGtk3::RedrawImages(int top_area_height, bool maximized) {
     for (size_t state = 0; state < views::Button::STATE_COUNT; state++) {
       button_images_[type][state] = gfx::ImageSkia(
           std::make_unique<NavButtonImageSource>(
-              type, static_cast<views::Button::ButtonState>(state), size),
+              type, static_cast<views::Button::ButtonState>(state), active,
+              size),
           size);
     }
   }

chrome/browser/ui/libgtkui/nav_button_provider_gtk3.h

@@ -21,7 +21,7 @@ class LIBGTKUI_EXPORT NavButtonProviderGtk3 : public views::NavButtonProvider {
   ~NavButtonProviderGtk3() override;
 
   // views::NavButtonProvider:
-  void RedrawImages(int top_area_height, bool maximized) override;
+  void RedrawImages(int top_area_height, bool maximized, bool active) override;
   gfx::ImageSkia GetImage(chrome::FrameButtonDisplayType type,
                           views::Button::ButtonState state) const override;
   gfx::Insets GetNavButtonMargin(

chrome/browser/ui/views/frame/browser_non_client_frame_view.h

@@ -104,6 +104,7 @@ class BrowserNonClientFrameView : public views::NonClientFrameView,
   }
 
   // views::NonClientFrameView:
+  void ActivationChanged(bool active) override;
   bool DoesIntersectRect(const views::View* target,
                          const gfx::Rect& rect) const override;
 
@@ -111,7 +112,6 @@ class BrowserNonClientFrameView : public views::NonClientFrameView,
   // views::NonClientFrameView:
   void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) override;
-  void ActivationChanged(bool active) override;
 
   // ProfileAttributesStorage::Observer:
   void OnProfileAdded(const base::FilePath& profile_path) override;

chrome/browser/ui/views/frame/opaque_browser_frame_view.cc

@@ -284,7 +284,11 @@ void OpaqueBrowserFrameView::UpdateWindowTitle() {
     window_title_->SchedulePaint();
 }
 
-void OpaqueBrowserFrameView::SizeConstraintsChanged() {
+void OpaqueBrowserFrameView::SizeConstraintsChanged() {}
+
+void OpaqueBrowserFrameView::ActivationChanged(bool active) {
+  BrowserNonClientFrameView::ActivationChanged(active);
+  MaybeRedrawFrameButtons();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -693,7 +697,8 @@ views::ImageButton* OpaqueBrowserFrameView::GetButtonFromDisplayType(
 
 void OpaqueBrowserFrameView::MaybeRedrawFrameButtons() {
   if (ShouldRenderNativeNavButtons()) {
-    nav_button_provider_->RedrawImages(GetTopAreaHeight(), IsMaximized());
+    nav_button_provider_->RedrawImages(GetTopAreaHeight(), IsMaximized(),
+                                       ShouldPaintAsActive());
     for (auto type : {
              chrome::FrameButtonDisplayType::kMinimize,
              IsMaximized() ? chrome::FrameButtonDisplayType::kRestore

chrome/browser/ui/views/frame/opaque_browser_frame_view.h

@@ -64,6 +64,7 @@ class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
   void UpdateWindowIcon() override;
   void UpdateWindowTitle() override;
   void SizeConstraintsChanged() override;
+  void ActivationChanged(bool active) override;
 
   // views::View:
   void GetAccessibleNodeData(ui::AXNodeData* node_data) override;

chrome/browser/ui/views/frame/opaque_browser_frame_view_layout_unittest.cc

@@ -130,7 +130,7 @@ class TestNavButtonProvider : public views::NavButtonProvider {
 
   ~TestNavButtonProvider() override {}
 
-  void RedrawImages(int top_area_height, bool maximized) override {
+  void RedrawImages(int top_area_height, bool maximized, bool active) override {
     ASSERT_EQ(false, maximized);  // This only tests the restored state.
   }
 

ui/views/window/nav_button_provider.h

@@ -22,9 +22,13 @@ class NavButtonProvider {
  public:
   virtual ~NavButtonProvider() {}
 
-  // If |top_area_height| is different from the cached top area
-  // height, redraws all button images at the new size.
-  virtual void RedrawImages(int top_area_height, bool maximized) = 0;
+  // Redraws all images and updates all size state.  |top_area_height|
+  // is the total available height to render the buttons, and buttons
+  // may be drawn larger when more height is available.  |active|
+  // indicates if the window the buttons reside in has activation.
+  virtual void RedrawImages(int top_area_height,
+                            bool maximized,
+                            bool active) = 0;
 
   // Gets the cached button image corresponding to |type| and |state|.
   virtual gfx::ImageSkia GetImage(chrome::FrameButtonDisplayType type,