Remove "Alternate frame caption button style" command line flag

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 "ash/ash_switches.h"
 #include "ash/frame/caption_buttons/frame_caption_button_container_view.h"
-#include "ash/frame/caption_buttons/frame_maximize_button.h"
-#include "ash/frame/caption_buttons/frame_maximize_button_observer.h"
 #include "ash/frame/default_header_painter.h"
 #include "ash/frame/frame_border_hit_test_controller.h"
 #include "ash/frame/frame_util.h"
 #include "ash/frame/header_painter.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/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/rect_conversions.h"
 #include "ui/gfx/size.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
-#include "ui/views/widget/widget_deletion_observer.h"
 
 namespace {
 
 ///////////////////////////////////////////////////////////////////////////////
 // CustomFrameViewAshWindowStateDelegate
 
 // Handles a user's fullscreen request (Shift+F4/F4). Puts the window into
 // immersive fullscreen if immersive fullscreen is enabled for non-browser
 // windows.
 class CustomFrameViewAshWindowStateDelegate
@@ skipping 74 matching lines @@
 namespace ash {
 
 ///////////////////////////////////////////////////////////////////////////////
 // CustomFrameViewAsh::HeaderView
 
 // View which paints the header. It slides off and on screen in immersive
 // fullscreen.
 class CustomFrameViewAsh::HeaderView
     : public views::View,
       public ImmersiveFullscreenController::Delegate,
-      public FrameMaximizeButtonObserver,
       public ShellObserver {
  public:
   // |frame| is the widget that the caption buttons act on.
   explicit HeaderView(views::Widget* frame);
   virtual ~HeaderView();
 
   // Schedules a repaint for the entire title.
   void SchedulePaintForTitle();
 
   // Tells the window controls to reset themselves to the normal state.
@@ skipping 27 matching lines @@
   }
 
  private:
   // ImmersiveFullscreenController::Delegate:
   virtual void OnImmersiveRevealStarted() OVERRIDE;
   virtual void OnImmersiveRevealEnded() OVERRIDE;
   virtual void OnImmersiveFullscreenExited() OVERRIDE;
   virtual void SetVisibleFraction(double visible_fraction) OVERRIDE;
   virtual std::vector<gfx::Rect> GetVisibleBoundsInScreen() const OVERRIDE;
 
-  // FrameMaximizeButtonObserver:
-  virtual void OnMaximizeBubbleShown(views::Widget* bubble) 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_;
 
-  // The maximize bubble widget. |maximize_bubble_| may be non-NULL but have
-  // been already destroyed.
-  views::Widget* maximize_bubble_;
-
-  // Keeps track of whether |maximize_bubble_| is still alive.
-  scoped_ptr<views::WidgetDeletionObserver> maximize_bubble_lifetime_observer_;
-
   // 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),
-      maximize_bubble_(NULL),
       fullscreen_visible_fraction_(0) {
   // Unfortunately, there is no views::WidgetDelegate::CanMinimize(). Assume
   // that the window frame can be minimized if it can be maximized.
   FrameCaptionButtonContainerView::MinimizeAllowed minimize_allowed =
       frame_->widget_delegate()->CanMaximize() ?
           FrameCaptionButtonContainerView::MINIMIZE_ALLOWED :
           FrameCaptionButtonContainerView::MINIMIZE_DISALLOWED;
   caption_button_container_ = new FrameCaptionButtonContainerView(frame_,
       minimize_allowed);
   caption_button_container_->UpdateSizeButtonVisibility(Shell::GetInstance()->
       IsMaximizeModeWindowManagerEnabled());
   AddChildView(caption_button_container_);
-  FrameMaximizeButton* frame_maximize_button =
-      caption_button_container_->GetOldStyleSizeButton();
-  if (frame_maximize_button)
-    frame_maximize_button->AddObserver(this);
 
   header_painter_->Init(frame_, this, NULL, caption_button_container_);
   UpdateAvatarIcon();
 
   Shell::GetInstance()->AddShellObserver(this);
 }
 
 CustomFrameViewAsh::HeaderView::~HeaderView() {
-  FrameMaximizeButton* frame_maximize_button =
-      caption_button_container_->GetOldStyleSizeButton();
-  if (frame_maximize_button)
-    frame_maximize_button->RemoveObserver(this);
   Shell::GetInstance()->RemoveShellObserver(this);
 }
 
 void CustomFrameViewAsh::HeaderView::SchedulePaintForTitle() {
   header_painter_->SchedulePaintForTitle();
 }
 
 void CustomFrameViewAsh::HeaderView::ResetWindowControls() {
   caption_button_container_->ResetWindowControls();
 }
@@ skipping 104 matching lines @@
 
 std::vector<gfx::Rect>
 CustomFrameViewAsh::HeaderView::GetVisibleBoundsInScreen() const {
   // TODO(pkotwicz): Implement views::View::ConvertRectToScreen().
   gfx::Rect visible_bounds(GetVisibleBounds());
   gfx::Point visible_origin_in_screen(visible_bounds.origin());
   views::View::ConvertPointToScreen(this, &visible_origin_in_screen);
   std::vector<gfx::Rect> bounds_in_screen;
   bounds_in_screen.push_back(
       gfx::Rect(visible_origin_in_screen, visible_bounds.size()));
-  if (maximize_bubble_lifetime_observer_.get() &&
-      maximize_bubble_lifetime_observer_->IsWidgetAlive()) {
-    bounds_in_screen.push_back(maximize_bubble_->GetWindowBoundsInScreen());
-  }
   return bounds_in_screen;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
-// CustomFrameViewAsh::HeaderView, FrameMaximizeButtonObserver overrides:
-
-void CustomFrameViewAsh::HeaderView::OnMaximizeBubbleShown(
-    views::Widget* bubble) {
-  maximize_bubble_ = bubble;
-  maximize_bubble_lifetime_observer_.reset(
-      new views::WidgetDeletionObserver(bubble));
-}
-
-///////////////////////////////////////////////////////////////////////////////
 // CustomFrameViewAsh::OverlayView
 
 // View which takes up the entire widget and contains the HeaderView. HeaderView
 // is a child of OverlayView to avoid creating a larger texture than necessary
 // when painting the HeaderView to its own layer.
 class CustomFrameViewAsh::OverlayView : public views::View {
  public:
   explicit OverlayView(HeaderView* header_view);
   virtual ~OverlayView();
 
@@ skipping 182 matching lines @@
 FrameCaptionButtonContainerView* CustomFrameViewAsh::
     GetFrameCaptionButtonContainerViewForTest() {
   return header_view_->caption_button_container();
 }
 
 int CustomFrameViewAsh::NonClientTopBorderHeight() const {
   return frame_->IsFullscreen() ? 0 : header_view_->GetPreferredHeight();
 }
 
 }  // namespace ash