exo: Add "back" button to shell surface decorations.

ash/frame/custom_frame_view_ash.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/frame/custom_frame_view_ash.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/ash_switches.h"
+#include "ash/frame/caption_buttons/frame_caption_button.h"
 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
 #include "ash/frame/default_header_painter.h"
 #include "ash/frame/frame_border_hit_test_controller.h"
 #include "ash/frame/header_painter.h"
+#include "ash/frame/header_painter_util.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shell.h"
 #include "ash/shell_observer.h"
 #include "ash/wm/immersive_fullscreen_controller.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_state_delegate.h"
 #include "ash/wm/window_state_observer.h"
 #include "base/command_line.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
+#include "ui/base/hit_test.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/image_view.h"
+#include "ui/views/layout/box_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/view_targeter.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace {
 
 ///////////////////////////////////////////////////////////////////////////////
 // CustomFrameViewAshWindowStateDelegate
 
@@ skipping 65 matching lines @@
     }
   }
 
   ash::wm::WindowState* window_state_;
   scoped_ptr<ash::ImmersiveFullscreenController>
       immersive_fullscreen_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(CustomFrameViewAshWindowStateDelegate);
 };
 
+class LeftHeaderView : public views::View {
+ public:
+  explicit LeftHeaderView(ash::FrameCaptionButton* caption_button)
+      : caption_button_(caption_button) {
+    SetLayoutManager(
+        new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 0));
+    AddChildView(caption_button_);
+    caption_button_->SetState(views::Button::STATE_NORMAL);
+  }
+  ~LeftHeaderView() override {}
+
+  void SetPaintAsActive(bool active) {
+    caption_button_->set_paint_as_active(active);
+  }
+
+ private:
+  ash::FrameCaptionButton* caption_button_;
+
+  DISALLOW_COPY_AND_ASSIGN(LeftHeaderView);
+};
+
+// Combines View::ConvertPointToTarget() and View::HitTest() for a given
+// |point|. Converts |point| from |src| to |dst| and hit tests it against |dst|.
+bool ConvertedHitTest(views::View* src,
+                      views::View* dst,
+                      const gfx::Point& point) {
+  DCHECK(src);
+  DCHECK(dst);
+  gfx::Point converted_point(point);
+  views::View::ConvertPointToTarget(src, dst, &converted_point);
+  return dst->HitTestPoint(converted_point);
+}
+
 }  // namespace
 
 namespace ash {
 
 ///////////////////////////////////////////////////////////////////////////////
 // CustomFrameViewAsh::HeaderView
 
 // View which paints the header. It slides off and on screen in immersive
 // fullscreen.
 class CustomFrameViewAsh::HeaderView
@@ skipping 19 matching lines @@
 
   // Returns the view's minimum width.
   int GetMinimumWidth() const;
 
   void UpdateAvatarIcon();
 
   void SizeConstraintsChanged();
 
   void SetFrameColors(SkColor active_frame_color, SkColor inactive_frame_color);
 
+  void SetLeftCaptionButton(FrameCaptionButton* left_caption_button);
+
   // views::View:
   void Layout() override;
   void OnPaint(gfx::Canvas* canvas) override;
   void ChildPreferredSizeChanged(views::View* child) override;
 
   // ShellObserver:
   void OnMaximizeModeStarted() override;
   void OnMaximizeModeEnded() override;
 
   FrameCaptionButtonContainerView* caption_button_container() {
     return caption_button_container_;
   }
 
   views::View* avatar_icon() const {
     return avatar_icon_;
   }
 
+  views::View* left_header_view() const { return left_header_view_; }
+
  private:
   // ImmersiveFullscreenController::Delegate:
   void OnImmersiveRevealStarted() override;
   void OnImmersiveRevealEnded() override;
   void OnImmersiveFullscreenExited() override;
   void SetVisibleFraction(double visible_fraction) override;
   std::vector<gfx::Rect> GetVisibleBoundsInScreen() const override;
 
   // The widget that the caption buttons act on.
   views::Widget* frame_;
 
   // Helper for painting the header.
   scoped_ptr<DefaultHeaderPainter> header_painter_;
 
   views::ImageView* avatar_icon_;
 
   // View which contains the window caption buttons.
   FrameCaptionButtonContainerView* caption_button_container_;
 
+  // View which contains the left caption button.
+  LeftHeaderView* left_header_view_;
+
   // The fraction of the header's height which is visible while in fullscreen.
   // This value is meaningless when not in fullscreen.
   double fullscreen_visible_fraction_;
 
   DISALLOW_COPY_AND_ASSIGN(HeaderView);
 };
 
 CustomFrameViewAsh::HeaderView::HeaderView(views::Widget* frame)
     : frame_(frame),
       header_painter_(new ash::DefaultHeaderPainter),
       avatar_icon_(NULL),
       caption_button_container_(NULL),
+      left_header_view_(NULL),
       fullscreen_visible_fraction_(0) {
   caption_button_container_ = new FrameCaptionButtonContainerView(frame_);
   caption_button_container_->UpdateSizeButtonVisibility();
   AddChildView(caption_button_container_);
 
   header_painter_->Init(frame_, this, caption_button_container_);
   UpdateAvatarIcon();
 
   Shell::GetInstance()->AddShellObserver(this);
 }
@@ skipping 53 matching lines @@
   caption_button_container_->ResetWindowControls();
   caption_button_container_->UpdateSizeButtonVisibility();
   Layout();
 }
 
 void CustomFrameViewAsh::HeaderView::SetFrameColors(
     SkColor active_frame_color, SkColor inactive_frame_color) {
   header_painter_->SetFrameColors(active_frame_color, inactive_frame_color);
 }
 
+void CustomFrameViewAsh::HeaderView::SetLeftCaptionButton(
+    FrameCaptionButton* left_caption_button) {
+  if (left_header_view_)
+    delete left_header_view_;
+  left_header_view_ = new LeftHeaderView(left_caption_button);
+  AddChildView(left_header_view_);
+  header_painter_->UpdateLeftHeaderView(left_header_view_);
+  Layout();
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // CustomFrameViewAsh::HeaderView, views::View overrides:
 
 void CustomFrameViewAsh::HeaderView::Layout() {
   header_painter_->LayoutHeader();
+  if (left_header_view_) {
+    header_painter_->UpdateLeftViewXInset(0);
+  } else {
+    header_painter_->UpdateLeftViewXInset(
+        ash::HeaderPainterUtil::GetDefaultLeftViewXInset());
+  }
 }
 
 void CustomFrameViewAsh::HeaderView::OnPaint(gfx::Canvas* canvas) {
   bool paint_as_active =
       frame_->non_client_view()->frame_view()->ShouldPaintAsActive();
   caption_button_container_->SetPaintAsActive(paint_as_active);
-
+  if (left_header_view_)
+    left_header_view_->SetPaintAsActive(paint_as_active);
   HeaderPainter::Mode header_mode = paint_as_active ?
       HeaderPainter::MODE_ACTIVE : HeaderPainter::MODE_INACTIVE;
   header_painter_->PaintHeader(canvas, header_mode);
 }
 
 void CustomFrameViewAsh::HeaderView::
     ChildPreferredSizeChanged(views::View* child) {
   // FrameCaptionButtonContainerView animates the visibility changes in
   // UpdateSizeButtonVisibility(false). Due to this a new size is not available
   // until the completion of the animation. Layout in response to the preferred
@@ skipping 155 matching lines @@
 void CustomFrameViewAsh::InitImmersiveFullscreenControllerForView(
     ImmersiveFullscreenController* immersive_fullscreen_controller) {
   immersive_fullscreen_controller->Init(header_view_, frame_, header_view_);
 }
 
 void CustomFrameViewAsh::SetFrameColors(SkColor active_frame_color,
                                         SkColor inactive_frame_color) {
   header_view_->SetFrameColors(active_frame_color, inactive_frame_color);
 }
 
+void CustomFrameViewAsh::SetLeftCaptionButton(
+    FrameCaptionButton* left_caption_button) {
+  header_view_->SetLeftCaptionButton(left_caption_button);
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // CustomFrameViewAsh, views::NonClientFrameView overrides:
 
 gfx::Rect CustomFrameViewAsh::GetBoundsForClientView() const {
   gfx::Rect client_bounds = bounds();
   client_bounds.Inset(0, NonClientTopBorderHeight(), 0, 0);
   return client_bounds;
 }
 
 gfx::Rect CustomFrameViewAsh::GetWindowBoundsForClientBounds(
     const gfx::Rect& client_bounds) const {
   gfx::Rect window_bounds = client_bounds;
   window_bounds.Inset(0, -NonClientTopBorderHeight(), 0, 0);
   return window_bounds;
 }
 
 int CustomFrameViewAsh::NonClientHitTest(const gfx::Point& point) {
-  return FrameBorderHitTestController::NonClientHitTest(this,
-      header_view_->caption_button_container(), point);
+  int hit_test = FrameBorderHitTestController::NonClientHitTest(
+      this, header_view_->caption_button_container(), point);
+
+  // See if the point is actually within the left header view.
+  if (hit_test == HTCAPTION && header_view_->left_header_view() &&
+      ConvertedHitTest(this, header_view_->left_header_view(), point)) {
+    return HTCLIENT;
+  }
+
+  return hit_test;
 }
 
 void CustomFrameViewAsh::GetWindowMask(const gfx::Size& size,
                                        gfx::Path* window_mask) {
   // No window masks in Aura.
 }
 
 void CustomFrameViewAsh::ResetWindowControls() {
   header_view_->ResetWindowControls();
 }
@@ skipping 88 matching lines @@
 FrameCaptionButtonContainerView* CustomFrameViewAsh::
     GetFrameCaptionButtonContainerViewForTest() {
   return header_view_->caption_button_container();
 }
 
 int CustomFrameViewAsh::NonClientTopBorderHeight() const {
   return frame_->IsFullscreen() ? 0 : header_view_->GetPreferredHeight();
 }
 
 }  // namespace ash