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

Unified Diff: chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc

Issue 10883069: Added restore functionality for maximize full/left/right (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
Index: chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc
diff --git a/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc
index ac73167b5bdbfe33346bf0efda7eb0b98e67e54c..e48860c509b1be2f2c0636080359d35356aacfcd 100644
--- a/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc
+++ b/chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.cc
@@ -131,9 +131,9 @@ BrowserNonClientFrameViewAsh::BrowserNonClientFrameViewAsh(
: 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() {
@@ -150,11 +150,11 @@ void BrowserNonClientFrameViewAsh::Init() {
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(
@@ -369,12 +369,10 @@ void BrowserNonClientFrameViewAsh::ButtonPressed(views::Button* sender,
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
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();

Powered by Google App Engine
This is Rietveld 408576698