Skip to content

GitLab

T
tangled
Commit 538d2c77 authored by pkotwicz@chromium.org's avatar pkotwicz@chromium.org
Browse files
Options

Land image assets for https://codereview.chromium.org/148003003/ 

BUG=297187
TEST=None
TBR=jamescook

Review URL: https://codereview.chromium.org/175893004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@252865 0039d316-1c4b-4281-b951-d872f2087c98
parent ba198cae
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 30 deletions
ash/resources/ash_resources.grd
View file @ 538d2c77
......@@ -17,6 +17,32 @@
<!-- KEEP THESE IN ALPHABETICAL ORDER! DO NOT ADD TO RANDOM PLACES JUST
BECAUSE YOUR RESOURCES ARE FUNCTIONALLY RELATED OR FALL UNDER THE
SAME CONDITIONALS. -->
<structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_H" file="common/browser_window_control_background_maximized_hover.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_MAXIMIZED_P" file="common/browser_window_control_background_maximized_pressed.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_H" file="common/browser_window_control_background_restored_hover.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_BACKGROUND_RESTORED_P" file="common/browser_window_control_background_restored_pressed.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_CLOSE" file="common/browser_window_control_icon_maximized_close.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_LEFT_SNAPPED" file="common/browser_window_control_icon_maximized_left_snapped.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_MINIMIZE" file="common/browser_window_control_icon_maximized_minimize.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_RIGHT_SNAPPED" file="common/browser_window_control_icon_maximized_right_snapped.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_MAXIMIZED_SIZE" file="common/browser_window_control_icon_maximized_size.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_CLOSE" file="common/browser_window_control_icon_restored_close.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_LEFT_SNAPPED" file="common/browser_window_control_icon_restored_left_snapped.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_MINIMIZE" file="common/browser_window_control_icon_restored_minimize.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_RIGHT_SNAPPED" file="common/browser_window_control_icon_restored_right_snapped.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_CONTROL_ICON_RESTORED_SIZE" file="common/browser_window_control_icon_restored_size.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_BASE_MAXIMIZED" file="common/browser_window_header_base_maximized.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_ACTIVE" file="common/browser_window_header_base_active.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_INACTIVE" file="common/browser_window_header_base_inactive.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_INCOGNITO_ACTIVE" file="common/browser_window_header_base_incognito_active.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_INCOGNITO_INACTIVE" file="common/browser_window_header_base_incognito_inactive.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_LEFT" file="common/browser_window_header_shade_left.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_RIGHT" file="common/browser_window_header_shade_right.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_TOP" file="common/browser_window_header_shade_top.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_TOP_LEFT" file="common/browser_window_header_shade_top_left.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_TOP_RIGHT" file="common/browser_window_header_shade_top_right.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_BACKGROUND" file="common/launcher/launcher_background.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_CORNER" file="common/launcher/launcher_corner.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_DIMMING" file="common/launcher/launcher_dimming.png" />
......@@ -151,6 +177,7 @@
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SHUTDOWN" file="cros/status/status_shutdown.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SHUTDOWN_HOVER" file="cros/status/status_shutdown_hover.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SMS" file="cros/status/status_sms.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_SMS_DISMISS" file="cros/status/status_sms_dismiss.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_TRACING" file="cros/status/status_tracing.png" />
<!-- ChromeOS specific icons -->
......@@ -213,16 +240,23 @@
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_BUTTON_SEPARATOR" file="common/window_button_separator.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CONTROL_BACKGROUND_H" file="common/window_control_background_hover.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CONTROL_BACKGROUND_P" file="common/window_control_background_pressed.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CONTROL_ICON_CLOSE" file="common/window_control_icon_close.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CONTROL_ICON_CLOSE_I" file="common/window_control_icon_close_inactive.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CONTROL_ICON_LEFT_SNAPPED" file="common/window_control_icon_left_snapped.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CONTROL_ICON_MINIMIZE" file="common/window_control_icon_minimize.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CONTROL_ICON_MINIMIZE_I" file="common/window_control_icon_minimize_inactive.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CONTROL_ICON_RIGHT_SNAPPED" file="common/window_control_icon_right_snapped.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CONTROL_ICON_SIZE" file="common/window_control_icon_size.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CONTROL_ICON_SIZE_I" file="common/window_control_icon_size_inactive.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_BASE_ACTIVE" file="common/window_header_base_active.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_BASE_INACTIVE" file="common/window_header_base_inactive.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_BASE_INCOGNITO_ACTIVE" file="common/window_header_base_incognito_active.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_BASE_INCOGNITO_INACTIVE" file="common/window_header_base_incognito_inactive.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_BASE_MINIMAL" file="common/window_header_base_minimal.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_LEFT" file="common/window_header_shade_left.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_RIGHT" file="common/window_header_shade_right.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_TOP" file="common/window_header_shade_top.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_TOP_LEFT" file="common/window_header_shade_top_left.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_TOP_RIGHT" file="common/window_header_shade_top_right.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_INACTIVE_BOTTOM" file="common/window_header_shade_bottom_inactive.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_INACTIVE_LEFT" file="common/window_header_shade_left_inactive.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_INACTIVE_RIGHT" file="common/window_header_shade_right_inactive.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_HEADER_SHADE_INACTIVE_TOP" file="common/window_header_shade_top_inactive.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE" file="common/window_close_tall_normal.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_WINDOW_CLOSE_H" file="common/window_close_tall_hover.png" />
......
ash/system/chromeos/network/tray_sms.cc
View file @ 538d2c77
......@@ -127,7 +127,7 @@ class TraySms::SmsMessageView : public views::View,
close_button->SetImage(
views::CustomButton::STATE_NORMAL,
ui::ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
IDR_AURA_WINDOW_CLOSE));
IDR_AURA_UBER_TRAY_SMS_DISMISS));
const int msg_width = owner_->system_tray()->GetSystemBubble()->
bubble_view()->GetPreferredSize().width() -
(kNotificationIconWidth + kTrayPopupPaddingHorizontal * 2);
......
ash/wm/custom_frame_view_ash.cc
View file @ 538d2c77
......@@ -265,11 +265,11 @@ void CustomFrameViewAsh::HeaderView::Layout() {
void CustomFrameViewAsh::HeaderView::OnPaint(gfx::Canvas* canvas) {
int theme_image_id = 0;
if (frame_->IsMaximized() || frame_->IsFullscreen())
theme_image_id = IDR_AURA_WINDOW_HEADER_BASE_MINIMAL;
theme_image_id = IDR_AURA_BROWSER_WINDOW_HEADER_BASE_MAXIMIZED;
else if (frame_->non_client_view()->frame_view()->ShouldPaintAsActive())
theme_image_id = IDR_AURA_WINDOW_HEADER_BASE_ACTIVE;
theme_image_id = IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_ACTIVE;
else
theme_image_id = IDR_AURA_WINDOW_HEADER_BASE_INACTIVE;
theme_image_id = IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_INACTIVE;
header_painter_->PaintHeader(
canvas,
......
ash/wm/header_painter.cc
View file @ 538d2c77
......@@ -170,16 +170,16 @@ void HeaderPainter::Init(
// Window frame image parts.
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
top_left_corner_ =
rb.GetImageNamed(IDR_AURA_WINDOW_HEADER_SHADE_TOP_LEFT).ToImageSkia();
top_edge_ =
rb.GetImageNamed(IDR_AURA_WINDOW_HEADER_SHADE_TOP).ToImageSkia();
top_right_corner_ =
rb.GetImageNamed(IDR_AURA_WINDOW_HEADER_SHADE_TOP_RIGHT).ToImageSkia();
header_left_edge_ =
rb.GetImageNamed(IDR_AURA_WINDOW_HEADER_SHADE_LEFT).ToImageSkia();
header_right_edge_ =
rb.GetImageNamed(IDR_AURA_WINDOW_HEADER_SHADE_RIGHT).ToImageSkia();
top_left_corner_ = rb.GetImageNamed(
IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_TOP_LEFT).ToImageSkia();
top_edge_ = rb.GetImageNamed(
IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_TOP).ToImageSkia();
top_right_corner_ = rb.GetImageNamed(
IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_TOP_RIGHT).ToImageSkia();
header_left_edge_ = rb.GetImageNamed(
IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_LEFT).ToImageSkia();
header_right_edge_ = rb.GetImageNamed(
IDR_AURA_BROWSER_WINDOW_HEADER_SHADE_RIGHT).ToImageSkia();
}
// static
......
ash/wm/panels/panel_frame_view.cc
View file @ 538d2c77
......@@ -117,9 +117,9 @@ void PanelFrameView::OnPaint(gfx::Canvas* canvas) {
bool paint_as_active = ShouldPaintAsActive();
int theme_frame_id = 0;
if (paint_as_active)
theme_frame_id = IDR_AURA_WINDOW_HEADER_BASE_ACTIVE;
theme_frame_id = IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_ACTIVE;
else
theme_frame_id = IDR_AURA_WINDOW_HEADER_BASE_INACTIVE;
theme_frame_id = IDR_AURA_BROWSER_WINDOW_HEADER_BASE_RESTORED_INACTIVE;
header_painter_->PaintHeader(
canvas,
......
chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
View file @ 538d2c77
......@@ -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 {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment