Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(610)

Unified Diff: ash/wm/maximize_bubble_controller.h

Issue 10883069: Added restore functionality for maximize full/left/right (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed unit test failure Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/custom_frame_view_ash_unittest.cc ('k') | ash/wm/maximize_bubble_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/maximize_bubble_controller.h
diff --git a/ash/wm/maximize_bubble_controller.h b/ash/wm/maximize_bubble_controller.h
index ab9083d1179f75665859ed3ba3f05fc671c30cb9..7328ea29c0d0cfa3106c0d617f657378c9e5dbfc 100644
--- a/ash/wm/maximize_bubble_controller.h
+++ b/ash/wm/maximize_bubble_controller.h
@@ -6,6 +6,7 @@
#define ASH_WM_MAXIMIZE_BUBBLE_CONTROLLER_H_
#include "ash/ash_export.h"
+#include "ash/wm/workspace/maximize_bubble_frame_state.h"
#include "ash/wm/workspace/snap_types.h"
#include "base/memory/scoped_ptr.h"
@@ -31,7 +32,7 @@ class ASH_EXPORT MaximizeBubbleController {
class Bubble;
MaximizeBubbleController(FrameMaximizeButton* frame_maximize_button,
- bool is_maximized,
+ MaximizeBubbleFrameState maximize_type,
int appearance_delay_ms);
// Called from the outside to destroy the interface to the UI visuals.
// The visuals will then delete when possible (maybe asynchronously).
@@ -61,7 +62,7 @@ class ASH_EXPORT MaximizeBubbleController {
}
// The status of the associated window: Maximized or normal.
- bool is_maximized() const { return is_maximized_; }
+ MaximizeBubbleFrameState maximize_type() const { return maximize_type_; }
// A unit test function to return buttons of the sub menu. |state| can be
// either SNAP_LEFT, SNAP_RIGHT or SNAP_MINIMIZE.
@@ -83,8 +84,8 @@ class ASH_EXPORT MaximizeBubbleController {
// The bubble menu.
Bubble* bubble_;
- // If true the owning window is maximized.
- const bool is_maximized_;
+ // The current maximize state of the owning window.
+ const MaximizeBubbleFrameState maximize_type_;
// The timer for the delayed creation of the menu.
scoped_ptr<base::Timer> timer_;
« no previous file with comments | « ash/wm/custom_frame_view_ash_unittest.cc ('k') | ash/wm/maximize_bubble_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698