diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 19:34:54 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 19:34:54 +0000 |
| commit | d88ce8c919bcab376a13904ac5cf41d380ea27f2 (patch) | |
| tree | c629cdcba83db2fb95d423f02cc26f01fd17487c /ash | |
| parent | c7ddefbfd84d38d9bfe83262b2901b227ae2d3e9 (diff) | |
| download | chromium_src-d88ce8c919bcab376a13904ac5cf41d380ea27f2.zip chromium_src-d88ce8c919bcab376a13904ac5cf41d380ea27f2.tar.gz chromium_src-d88ce8c919bcab376a13904ac5cf41d380ea27f2.tar.bz2 | |
The new close assets are only intended for when the frame is actually
maximized. So, use them only in that case (panels/dialogs pass in true
even though they aren't maximized).
BUG=148848
TEST=see bug
R=jamescook@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10910244
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156604 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/wm/frame_painter.cc | 10 | ||||
| -rw-r--r-- | ash/wm/frame_painter.h | 5 |
2 files changed, 8 insertions, 7 deletions
diff --git a/ash/wm/frame_painter.cc b/ash/wm/frame_painter.cc index ebe0cf0..01f3a80 100644 --- a/ash/wm/frame_painter.cc +++ b/ash/wm/frame_painter.cc @@ -470,10 +470,10 @@ void FramePainter::PaintTitleBar(views::NonClientFrameView* view, } void FramePainter::LayoutHeader(views::NonClientFrameView* view, - bool maximized_layout) { - // The maximized layout uses shorter buttons. - if (maximized_layout && - internal::WorkspaceController::IsWorkspace2Enabled()) { + bool shorter_layout) { + // The new assets only make sense if the window is actually maximized. + if (internal::WorkspaceController::IsWorkspace2Enabled() && + shorter_layout && frame_->IsMaximized()) { SetButtonImages(close_button_, IDR_AURA_WINDOW_MAXIMIZED_CLOSE2, IDR_AURA_WINDOW_MAXIMIZED_CLOSE2_H, @@ -486,7 +486,7 @@ void FramePainter::LayoutHeader(views::NonClientFrameView* view, IDR_AURA_WINDOW_MAXIMIZED_RESTORE2, IDR_AURA_WINDOW_MAXIMIZED_RESTORE2_H, IDR_AURA_WINDOW_MAXIMIZED_RESTORE2_P); - } else if (maximized_layout) { + } else if (shorter_layout) { SetButtonImages(close_button_, IDR_AURA_WINDOW_MAXIMIZED_CLOSE, IDR_AURA_WINDOW_MAXIMIZED_CLOSE_H, diff --git a/ash/wm/frame_painter.h b/ash/wm/frame_painter.h index cd725d4..224e54b 100644 --- a/ash/wm/frame_painter.h +++ b/ash/wm/frame_painter.h @@ -108,8 +108,9 @@ class ASH_EXPORT FramePainter : public aura::WindowObserver, const gfx::Font& title_font); // Performs layout for the header based on whether we want the shorter - // |maximized_layout| appearance. - void LayoutHeader(views::NonClientFrameView* view, bool maximized_layout); + // appearance. |shorter_layout| is typically used for maximized windows, but + // not always. + void LayoutHeader(views::NonClientFrameView* view, bool shorter_layout); // aura::WindowObserver overrides: virtual void OnWindowPropertyChanged(aura::Window* window, |