Added restore functionality for maximize full/left/right

ash/wm/maximize_bubble_controller.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/wm/maximize_bubble_controller.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/wm/window_animations.h"
 #include "ash/wm/workspace/frame_maximize_button.h"
@@ skipping 483 matching lines @@
 
 bool MaximizeBubbleController::Bubble::Contains(
     const gfx::Point& screen_point,
     views::MouseWatcherHost::MouseEventType type) {
   if (!owner_ || shutting_down_)
     return false;
   bool inside_button =
       owner_->frame_maximize_button()->GetBoundsInScreen().Contains(
           screen_point);
   if (!owner_->frame_maximize_button()->is_snap_enabled() && inside_button) {
-    SetSnapType(controller()->is_maximized() ? SNAP_RESTORE : SNAP_MAXIMIZE);
+    SetSnapType(controller()->maximize_type() == FRAME_STATE_FULL ?
+        SNAP_RESTORE : SNAP_MAXIMIZE);
     return true;
   }
   // Check if either a gesture is taking place (=> bubble stays no matter what
   // the mouse does) or the mouse is over the maximize button or the bubble
   // content.
   return (owner_->frame_maximize_button()->is_snap_enabled() ||
           inside_button ||
           contents_view_->GetBoundsInScreen().Contains(screen_point));
 }
 
@@ skipping 46 matching lines @@
     MaximizeBubbleController::Bubble* bubble)
     : bubble_(bubble),
       left_button_(NULL),
       minimize_button_(NULL),
       right_button_(NULL) {
   SetLayoutManager(new views::BoxLayout(
       views::BoxLayout::kHorizontal, 0, 0, kLayoutSpacing));
   set_background(
       views::Background::CreateSolidBackground(kBubbleBackgroundColor));
 
-  left_button_ = new BubbleDialogButton(
-      this,
-      IDR_AURA_WINDOW_POSITION_LEFT,
-      IDR_AURA_WINDOW_POSITION_LEFT_H,
-      IDR_AURA_WINDOW_POSITION_LEFT_P);
+  if (bubble_->controller()->maximize_type() == FRAME_STATE_SNAP_LEFT) {
+    left_button_ = new BubbleDialogButton(
+        this,
+        IDR_AURA_WINDOW_POSITION_LEFT_RESTORE,
+        IDR_AURA_WINDOW_POSITION_LEFT_RESTORE_H,
+        IDR_AURA_WINDOW_POSITION_LEFT_RESTORE_P);
+  } else {
+    left_button_ = new BubbleDialogButton(
+        this,
+        IDR_AURA_WINDOW_POSITION_LEFT,
+        IDR_AURA_WINDOW_POSITION_LEFT_H,
+        IDR_AURA_WINDOW_POSITION_LEFT_P);
+  }
   minimize_button_ = new BubbleDialogButton(
       this,
       IDR_AURA_WINDOW_POSITION_MIDDLE,
       IDR_AURA_WINDOW_POSITION_MIDDLE_H,
       IDR_AURA_WINDOW_POSITION_MIDDLE_P);
-  right_button_ = new BubbleDialogButton(
-      this,
-      IDR_AURA_WINDOW_POSITION_RIGHT,
-      IDR_AURA_WINDOW_POSITION_RIGHT_H,
-      IDR_AURA_WINDOW_POSITION_RIGHT_P);
+  if (bubble_->controller()->maximize_type() == FRAME_STATE_SNAP_RIGHT) {
+    right_button_ = new BubbleDialogButton(
+        this,
+        IDR_AURA_WINDOW_POSITION_RIGHT_RESTORE,
+        IDR_AURA_WINDOW_POSITION_RIGHT_RESTORE_H,
+        IDR_AURA_WINDOW_POSITION_RIGHT_RESTORE_P);
+  } else {
+    right_button_ = new BubbleDialogButton(
+        this,
+        IDR_AURA_WINDOW_POSITION_RIGHT,
+        IDR_AURA_WINDOW_POSITION_RIGHT_H,
+        IDR_AURA_WINDOW_POSITION_RIGHT_P);
+  }
 }
 
 // Overridden from ButtonListener.
 void BubbleContentsButtonRow::ButtonPressed(views::Button* sender,
                                             const ui::Event& event) {
   // While shutting down, the connection to the owner might already be broken.
   if (!bubble_->controller())
     return;
   if (sender == left_button_)
-    bubble_->controller()->OnButtonClicked(SNAP_LEFT);
+    bubble_->controller()->OnButtonClicked(
+        bubble_->controller()->maximize_type() == FRAME_STATE_SNAP_LEFT ?
+            SNAP_RESTORE : SNAP_LEFT);
   else if (sender == minimize_button_)
     bubble_->controller()->OnButtonClicked(SNAP_MINIMIZE);
   else if (sender == right_button_)
-    bubble_->controller()->OnButtonClicked(SNAP_RIGHT);
+    bubble_->controller()->OnButtonClicked(
+        bubble_->controller()->maximize_type() == FRAME_STATE_SNAP_RIGHT ?
+            SNAP_RESTORE : SNAP_RIGHT);
   else
     NOTREACHED() << "Unknown button pressed.";
 }
 
 // Called from BubbleDialogButton.
 void BubbleContentsButtonRow::ButtonHovered(BubbleDialogButton* sender) {
   // While shutting down, the connection to the owner might already be broken.
   if (!bubble_->controller())
     return;
   if (sender == left_button_)
-    bubble_->controller()->OnButtonHover(SNAP_LEFT);
+    bubble_->controller()->OnButtonHover(
+        bubble_->controller()->maximize_type() == FRAME_STATE_SNAP_LEFT ?
+            SNAP_RESTORE : SNAP_LEFT);
   else if (sender == minimize_button_)
     bubble_->controller()->OnButtonHover(SNAP_MINIMIZE);
   else if (sender == right_button_)
-    bubble_->controller()->OnButtonHover(SNAP_RIGHT);
+    bubble_->controller()->OnButtonHover(
+        bubble_->controller()->maximize_type() == FRAME_STATE_SNAP_RIGHT ?
+            SNAP_RESTORE : SNAP_RIGHT);
   else
     bubble_->controller()->OnButtonHover(SNAP_NONE);
 }
 
 views::CustomButton* BubbleContentsButtonRow::GetButtonForUnitTest(
     SnapType state) {
   switch (state) {
     case SNAP_LEFT:
       return left_button_;
     case SNAP_MINIMIZE:
@@ skipping 39 matching lines @@
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   int id = 0;
   switch (snap_type) {
     case SNAP_LEFT:
       id = IDS_ASH_SNAP_WINDOW_LEFT;
       break;
     case SNAP_RIGHT:
       id = IDS_ASH_SNAP_WINDOW_RIGHT;
       break;
     case SNAP_MAXIMIZE:
-      DCHECK(!bubble_->controller()->is_maximized());
+      DCHECK_NE(FRAME_STATE_FULL, bubble_->controller()->maximize_type());
       id = IDS_ASH_MAXIMIZE_WINDOW;
       break;
     case SNAP_MINIMIZE:
       id = IDS_ASH_MINIMIZE_WINDOW;
       break;
     case SNAP_RESTORE:
-      DCHECK(bubble_->controller()->is_maximized());
+      DCHECK_NE(FRAME_STATE_NONE, bubble_->controller()->maximize_type());
       id = IDS_ASH_RESTORE_WINDOW;
       break;
     default:
       // If nothing is selected, we automatically select the click operation.
-      id = bubble_->controller()->is_maximized() ? IDS_ASH_RESTORE_WINDOW :
+      id = bubble_->controller()->maximize_type() ? IDS_ASH_RESTORE_WINDOW :
                IDS_ASH_MAXIMIZE_WINDOW;
       break;
   }
   label_view_->SetText(rb.GetLocalizedString(id));
 }
 
 MaximizeBubbleController::MaximizeBubbleController(
     FrameMaximizeButton* frame_maximize_button,
-    bool is_maximized,
+    MaximizeBubbleFrameState maximize_type,
     int appearance_delay_ms)
     : frame_maximize_button_(frame_maximize_button),
       bubble_(NULL),
-      is_maximized_(is_maximized),
+      maximize_type_(maximize_type),
       appearance_delay_ms_(appearance_delay_ms) {
   // Create the task which will create the bubble delayed.
   base::OneShotTimer<MaximizeBubbleController>* new_timer =
       new base::OneShotTimer<MaximizeBubbleController>();
   // Note: Even if there was no delay time given, we need to have a timer.
   new_timer->Start(
       FROM_HERE,
       base::TimeDelta::FromMilliseconds(
           appearance_delay_ms_ ? appearance_delay_ms_ : 10),
       this,
@@ skipping 96 matching lines @@
   if (!GetBoundsInScreen().Contains(screen_location))
     button_row_->ButtonHovered(NULL);
   else
     button_row_->ButtonHovered(this);
 
   // Pass the event on to the normal handler.
   return views::ImageButton::OnMouseDragged(event);
 }
 
 }  // namespace ash