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

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

Issue 175893004: Land image assets for https://codereview.chromium.org/148003003/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 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/panels/panel_frame_view.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
index 6f75116b5eff8d6f3a1977dd4c5091f7fbd7bd12..278f56bba94ec7992c5a66b3ba8d40f3641eb8d2 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
@@ -253,7 +253,7 @@ void BrowserNonClientFrameViewAsh::OnPaint(gfx::Canvas* canvas) {
(theme_frame_overlay_image_id == 0 ||
!theme_provider->HasCustomImage(theme_frame_overlay_image_id))) {
if (frame()->IsMaximized() || frame()->IsFullscreen())
- theme_frame_image_id = IDR_AURA_WINDOW_HEADER_BASE_MINIMAL;
+ theme_frame_image_id = IDR_AURA_BROWSER_WINDOW_HEADER_BASE_MAXIMIZED;
}
header_painter_->PaintHeader(
canvas,
@@ -436,7 +436,7 @@ void BrowserNonClientFrameViewAsh::PaintImmersiveLightbarStyleHeader(
gfx::Canvas* canvas) {
// The light bar header is not themed because theming it does not look good.
gfx::ImageSkia* frame_image = GetThemeProvider()->GetImageSkiaNamed(
- IDR_AURA_WINDOW_HEADER_BASE_MINIMAL);
+ IDR_AURA_BROWSER_WINDOW_HEADER_BASE_MAXIMIZED);
canvas->TileImageInt(*frame_image, 0, 0, width(), frame_image->height());
}
@@ -539,12 +539,12 @@ int BrowserNonClientFrameViewAsh::GetThemeFrameImageId() const {
// Never theme app and popup windows.
if (ShouldPaintAsActive()) {
return is_incognito ?
- IDR_AURA_WINDOW_HEADER_BASE_INCOGNITO_ACTIVE :
- IDR_AURA_WINDOW_HEADER_BASE_ACTIVE;
+ IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_INCOGNITO_ACTIVE :
+ IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_ACTIVE;
}
return is_incognito ?
- IDR_AURA_WINDOW_HEADER_BASE_INCOGNITO_INACTIVE :
- IDR_AURA_WINDOW_HEADER_BASE_INACTIVE;
+ IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_INCOGNITO_INACTIVE :
+ IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_INACTIVE;
}
int BrowserNonClientFrameViewAsh::GetThemeFrameOverlayImageId() const {
« no previous file with comments | « ash/wm/panels/panel_frame_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698