Added restore functionality for maximize full/left/right

chrome/browser/ui/views/ash/browser_non_client_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 "chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h"
 
 #include "ash/wm/frame_painter.h"
 #include "ash/wm/workspace/frame_maximize_button.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 113 matching lines @@
 
 // static
 const char BrowserNonClientFrameViewAsh::kViewClassName[] =
     "BrowserNonClientFrameViewAsh";
 
 BrowserNonClientFrameViewAsh::BrowserNonClientFrameViewAsh(
     BrowserFrame* frame, BrowserView* browser_view)
     : BrowserNonClientFrameView(frame, browser_view),
       size_button_(NULL),
       close_button_(NULL),
+      maximize_button_(NULL),
       window_icon_(NULL),
-      frame_painter_(new ash::FramePainter),
-      size_button_minimizes_(false) {
+      frame_painter_(new ash::FramePainter) {
 }
 
 BrowserNonClientFrameViewAsh::~BrowserNonClientFrameViewAsh() {
   // A non-NULL |size_button_| means it was initialized in Init() where
   // |this| was added as observer to ToolbarSearchAnimator, so remove it now.
   if (size_button_) {
     browser_view()->browser()->search_delegate()->toolbar_search_animator().
         RemoveObserver(this);
   }
 }
 
 void BrowserNonClientFrameViewAsh::Init() {
   // Panels only minimize.
   ash::FramePainter::SizeButtonBehavior size_button_behavior;
   if (browser_view()->browser()->is_type_panel() &&
       browser_view()->browser()->app_type() == Browser::APP_TYPE_CHILD) {
-    size_button_minimizes_ = true;
     size_button_ = new views::ImageButton(this);
     size_button_behavior = ash::FramePainter::SIZE_BUTTON_MINIMIZES;
   } else {
-    size_button_ = new ash::FrameMaximizeButton(this, this);
+    maximize_button_ = new ash::FrameMaximizeButton(this, this);
+    size_button_ = maximize_button_;
     size_button_behavior = ash::FramePainter::SIZE_BUTTON_MAXIMIZES;
   }
   size_button_->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_ACCNAME_MAXIMIZE));
   AddChildView(size_button_);
   close_button_ = new views::ImageButton(this);
   close_button_->SetAccessibleName(
       l10n_util::GetStringUTF16(IDS_ACCNAME_CLOSE));
   AddChildView(close_button_);
 
@@ skipping 194 matching lines @@
                                                   const ui::Event& event) {
   // When shift-clicking slow down animations for visual debugging.
   // We used to do this via an event filter that looked for the shift key being
   // pressed but this interfered with several normal keyboard shortcuts.
   if (event.IsShiftDown())
     ui::LayerAnimator::set_slow_animation_mode(true);
 
   if (sender == size_button_) {
     // The maximize button may move out from under the cursor.
     ResetWindowControls();
-    if (size_button_minimizes_)
+    if (!maximize_button_)
       frame()->Minimize();
-    else if (frame()->IsMaximized())
-      frame()->Restore();
     else
-      frame()->Maximize();
+      maximize_button_->ToggleMaximize();

[sky, 2012/08/27 22:18:16]

This shouldn't call through to the maximize button. It should merge with the
code in WorkspaceEventFilter ToggleMaximizedState.

[Mr4D (OOO till 08-26), 2012/08/28 01:30:25]

Done.

     // |this| may be deleted - some windows delete their frames on maximize.
   } else if (sender == close_button_) {
     frame()->Close();
   }
 
   if (event.IsShiftDown())
     ui::LayerAnimator::set_slow_animation_mode(false);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ skipping 215 matching lines @@
 BrowserNonClientFrameViewAsh::GetThemeFrameOverlayImage() const {
   ui::ThemeProvider* tp = GetThemeProvider();
   if (tp->HasCustomImage(IDR_THEME_FRAME_OVERLAY) &&
       browser_view()->IsBrowserTypeNormal() &&
       !browser_view()->IsOffTheRecord()) {
     return tp->GetImageSkiaNamed(ShouldPaintAsActive() ?
         IDR_THEME_FRAME_OVERLAY : IDR_THEME_FRAME_OVERLAY_INACTIVE);
   }
   return NULL;
 }