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

Unified Diff: ash/wm/panel_frame_view.cc

Issue 9956063: Merge 130064 - Changes the maximize button to only minimize for panels. This resulted (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1084/src/
Patch Set: Created 8 years, 9 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/frame_painter.cc ('k') | ash/wm/workspace/frame_maximize_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/panel_frame_view.cc
===================================================================
--- ash/wm/panel_frame_view.cc (revision 130125)
+++ ash/wm/panel_frame_view.cc (working copy)
@@ -23,7 +23,7 @@
namespace ash {
PanelFrameView::PanelFrameView(views::Widget* frame)
- : frame_painter_(new FramePainter) {
+ : frame_painter_(new FramePainter) {
close_button_ = new views::ImageButton(this);
close_button_->SetAccessibleName(
l10n_util::GetStringUTF16(IDS_APP_ACCNAME_CLOSE));
@@ -34,7 +34,8 @@
l10n_util::GetStringUTF16(IDS_APP_ACCNAME_MINIMIZE));
AddChildView(minimize_button_);
- frame_painter_->Init(frame, NULL, minimize_button_, close_button_);
+ frame_painter_->Init(frame, NULL, minimize_button_, close_button_,
+ FramePainter::SIZE_BUTTON_MINIMIZES);
}
PanelFrameView::~PanelFrameView() {
« no previous file with comments | « ash/wm/frame_painter.cc ('k') | ash/wm/workspace/frame_maximize_button.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698