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

Unified Diff: ash/wm/frame_painter.cc

Issue 10823025: Adding new maximize menu according to spec (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: git try 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/ash_strings.grd ('k') | ash/wm/maximize_bubble_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/frame_painter.cc
diff --git a/ash/wm/frame_painter.cc b/ash/wm/frame_painter.cc
index 5d190a6f78b59fd92eb6bc1c46e9923d42a96525..553851d8ae57871d01cd1cb445f6ca15c6b10c53 100644
--- a/ash/wm/frame_painter.cc
+++ b/ash/wm/frame_painter.cc
@@ -466,25 +466,19 @@ void FramePainter::LayoutHeader(views::NonClientFrameView* view,
IDR_AURA_WINDOW_MAXIMIZED_CLOSE,
IDR_AURA_WINDOW_MAXIMIZED_CLOSE_H,
IDR_AURA_WINDOW_MAXIMIZED_CLOSE_P);
- if (size_button_behavior_ == SIZE_BUTTON_MINIMIZES) {
- SetButtonImages(size_button_,
- IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE,
- IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_H,
- IDR_AURA_WINDOW_MAXIMIZED_MINIMIZE_P);
- } else {
- SetButtonImages(size_button_,
- IDR_AURA_WINDOW_MAXIMIZED_RESTORE,
- IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H,
- IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P);
- }
+ // The chat window cannot be restored but only minimized.
+ // Case: (size_button_behavior_ == SIZE_BUTTON_MINIMIZES). We used to have
+ // a special set of artwork to show this case, but per discussion we
+ // removed this.
+ SetButtonImages(size_button_,
+ IDR_AURA_WINDOW_MAXIMIZED_RESTORE,
+ IDR_AURA_WINDOW_MAXIMIZED_RESTORE_H,
+ IDR_AURA_WINDOW_MAXIMIZED_RESTORE_P);
} else {
SetButtonImages(close_button_,
IDR_AURA_WINDOW_CLOSE,
IDR_AURA_WINDOW_CLOSE_H,
IDR_AURA_WINDOW_CLOSE_P);
- // TODO(jamescook): If we ever have normal-layout windows (with the
- // standard 35 pixel tall headers) that can only minimize, we'll need art
- // assets for SIZE_BUTTON_MINIMIZES. As of R19 we don't use them.
SetButtonImages(size_button_,
IDR_AURA_WINDOW_MAXIMIZE,
IDR_AURA_WINDOW_MAXIMIZE_H,
« no previous file with comments | « ash/ash_strings.grd ('k') | ash/wm/maximize_bubble_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698