Skip to content

GitLab

T
tangled
Commit de833276 authored by oshima@chromium.org's avatar oshima@chromium.org
Browse files
Options

New resources for launcher 

rename files to match IDR names.

BUG=152929
TEST=none

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170872 0039d316-1c4b-4281-b951-d872f2087c98
parent 9dca064c
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 16 deletions
ash/launcher/launcher.cc
View file @ de833276
...@@ -108,7 +108,7 @@ class DimmerView : public views::WidgetDelegateView, ...@@ -108,7 +108,7 @@ class DimmerView : public views::WidgetDelegateView,
if (!launcher_background) { if (!launcher_background) {
ResourceBundle& rb = ResourceBundle::GetSharedInstance(); ResourceBundle& rb = ResourceBundle::GetSharedInstance();
launcher_background = launcher_background =
rb.GetImageNamed(IDR_AURA_LAUNCHER_DIMMING).ToImageSkia(); rb.GetImageNamed(IDR_AURA_LAUNCHER_DIMMING_BOTTOM).ToImageSkia();
} }
paint.setAlpha(kDimAlpha); paint.setAlpha(kDimAlpha);
canvas->DrawImageInt( canvas->DrawImageInt(
...@@ -171,7 +171,7 @@ void Launcher::DelegateView::OnPaintBackground(gfx::Canvas* canvas) { ...@@ -171,7 +171,7 @@ void Launcher::DelegateView::OnPaintBackground(gfx::Canvas* canvas) {
if (!launcher_background) { if (!launcher_background) {
ResourceBundle& rb = ResourceBundle::GetSharedInstance(); ResourceBundle& rb = ResourceBundle::GetSharedInstance();
launcher_background = launcher_background =
rb.GetImageNamed(IDR_AURA_LAUNCHER_BACKGROUND).ToImageSkia(); rb.GetImageNamed(IDR_AURA_LAUNCHER_BACKGROUND_BOTTOM).ToImageSkia();
} }
paint.setAlpha(alpha_); paint.setAlpha(alpha_);
canvas->DrawImageInt( canvas->DrawImageInt(
......
ash/launcher/launcher_button.cc
View file @ de833276
...@@ -354,18 +354,18 @@ void LauncherButton::UpdateState() { ...@@ -354,18 +354,18 @@ void LauncherButton::UpdateState() {
int bar_id; int bar_id;
if (IsShelfHorizontal()) { if (IsShelfHorizontal()) {
if (state_ & STATE_ACTIVE) if (state_ & STATE_ACTIVE)
bar_id = IDR_AURA_LAUNCHER_UNDERLINE_ACTIVE; bar_id = IDR_AURA_LAUNCHER_UNDERLINE_BOTTOM_ACTIVE;
else if (state_ & (STATE_HOVERED | STATE_FOCUSED | STATE_ATTENTION)) else if (state_ & (STATE_HOVERED | STATE_FOCUSED | STATE_ATTENTION))
bar_id = IDR_AURA_LAUNCHER_UNDERLINE_HOVER; bar_id = IDR_AURA_LAUNCHER_UNDERLINE_BOTTOM_HOVER;
else else
bar_id = IDR_AURA_LAUNCHER_UNDERLINE_RUNNING; bar_id = IDR_AURA_LAUNCHER_UNDERLINE_BOTTOM_RUNNING;
} else { } else {
if (state_ & STATE_ACTIVE) if (state_ & STATE_ACTIVE)
bar_id = IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_ACTIVE; bar_id = IDR_AURA_LAUNCHER_UNDERLINE_LEFT_ACTIVE;
else if (state_ & (STATE_HOVERED | STATE_FOCUSED | STATE_ATTENTION)) else if (state_ & (STATE_HOVERED | STATE_FOCUSED | STATE_ATTENTION))
bar_id = IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_HOVER; bar_id = IDR_AURA_LAUNCHER_UNDERLINE_LEFT_HOVER;
else else
bar_id = IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_RUNNING; bar_id = IDR_AURA_LAUNCHER_UNDERLINE_LEFT_RUNNING;
} }
ResourceBundle& rb = ResourceBundle::GetSharedInstance(); ResourceBundle& rb = ResourceBundle::GetSharedInstance();
......
ash/resources/ash_resources.grd
View file @ de833276
...@@ -48,23 +48,30 @@ ...@@ -48,23 +48,30 @@
<structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_GRAB" file="cros/pointers/fleur.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_GRAB" file="cros/pointers/fleur.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_GRABBING" file="cros/pointers/hand3.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_CURSOR_GRABBING" file="cros/pointers/hand3.png" />
</if> </if>
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_BACKGROUND" file="common/launcher_background.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_BACKGROUND_BOTTOM" file="common/launcher_background.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_BACKGROUND_LEFT" file="common/launcher_background_left.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_BACKGROUND_RIGHT" file="common/launcher_background_right.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_BROWSER" file="common/launcher_browser.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_BROWSER" file="common/launcher_browser.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_BROWSER_PANEL" file="common/launcher_browser_panel.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_BROWSER_PANEL" file="common/launcher_browser_panel.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_BROWSER_SHORTCUT" file="common/chromium-32.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_BROWSER_SHORTCUT" file="common/chromium-32.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_DIMMING" file="common/launcher_dimming.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_DIMMING_BOTTOM" file="common/launcher_dimming.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_DIMMING_LEFT" file="common/launcher_dimming_left.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_DIMMING_RIGHT" file="common/launcher_dimming_right.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_ICON_APPLIST" file="common/status/launcher_appmenu.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_ICON_APPLIST" file="common/status/launcher_appmenu.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_ICON_APPLIST_HOT" file="common/status/launcher_appmenu_hover.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_ICON_APPLIST_HOT" file="common/status/launcher_appmenu_hover.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_ICON_APPLIST_PUSHED" file="common/status/launcher_appmenu_pressed.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_ICON_APPLIST_PUSHED" file="common/status/launcher_appmenu_pressed.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_INCOGNITO_BROWSER" file="common/launcher_incognito_browser.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_INCOGNITO_BROWSER" file="common/launcher_incognito_browser.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_INCOGNITO_BROWSER_PANEL" file="common/launcher_incognito_browser_panel.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_INCOGNITO_BROWSER_PANEL" file="common/launcher_incognito_browser_panel.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_OVERFLOW" file="common/launcher_overflow.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_OVERFLOW" file="common/launcher_overflow.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_ACTIVE" file="common/launcher_underline_active.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_BOTTOM_ACTIVE" file="common/launcher_underline_bottom_active.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_HOVER" file="common/launcher_underline_hover.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_BOTTOM_HOVER" file="common/launcher_underline_bottom_hover.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_RUNNING" file="common/launcher_underline_running.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_BOTTOM_RUNNING" file="common/launcher_underline_bottom_running.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_ACTIVE" file="common/launcher_underline_active.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_LEFT_ACTIVE" file="common/launcher_underline_left_active.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_HOVER" file="common/launcher_underline_hover.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_LEFT_HOVER" file="common/launcher_underline_left_hover.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_RUNNING" file="common/launcher_underline_running.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_LEFT_RUNNING" file="common/launcher_underline_left_running.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_RIGHT_ACTIVE" file="common/launcher_underline_right_active.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_RIGHT_HOVER" file="common/launcher_underline_right_hover.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_LAUNCHER_UNDERLINE_RIGHT_RUNNING" file="common/launcher_underline_right_running.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_MULTI_WINDOW_RESIZE_H" file="common/multi_window_resize_horizontal.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_MULTI_WINDOW_RESIZE_H" file="common/multi_window_resize_horizontal.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_MULTI_WINDOW_RESIZE_V" file="common/multi_window_resize_vertical.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_MULTI_WINDOW_RESIZE_V" file="common/multi_window_resize_vertical.png" />
<structure type="chrome_scaled_image" name="IDR_AURA_RESIZE_SHADOW_BOTTOM" file="common/resize_shadow_bottom.png" /> <structure type="chrome_scaled_image" name="IDR_AURA_RESIZE_SHADOW_BOTTOM" file="common/resize_shadow_bottom.png" />
......
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