diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 03:01:28 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-04 03:01:28 +0000 |
| commit | de83327682e3ff7e491fb750caafe0d0b1bdf58f (patch) | |
| tree | 8b3c45bf5ec528c3335d0806b3f5b664c24c2f70 /ash/launcher | |
| parent | 9dca064cd55041e8b8f7f52634b00aa73f9c1e4a (diff) | |
| download | chromium_src-de83327682e3ff7e491fb750caafe0d0b1bdf58f.zip chromium_src-de83327682e3ff7e491fb750caafe0d0b1bdf58f.tar.gz chromium_src-de83327682e3ff7e491fb750caafe0d0b1bdf58f.tar.bz2 | |
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
Diffstat (limited to 'ash/launcher')
| -rw-r--r-- | ash/launcher/launcher.cc | 4 | ||||
| -rw-r--r-- | ash/launcher/launcher_button.cc | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/ash/launcher/launcher.cc b/ash/launcher/launcher.cc index b794cc3..f38b567 100644 --- a/ash/launcher/launcher.cc +++ b/ash/launcher/launcher.cc @@ -108,7 +108,7 @@ class DimmerView : public views::WidgetDelegateView, if (!launcher_background) { ResourceBundle& rb = ResourceBundle::GetSharedInstance(); launcher_background = - rb.GetImageNamed(IDR_AURA_LAUNCHER_DIMMING).ToImageSkia(); + rb.GetImageNamed(IDR_AURA_LAUNCHER_DIMMING_BOTTOM).ToImageSkia(); } paint.setAlpha(kDimAlpha); canvas->DrawImageInt( @@ -171,7 +171,7 @@ void Launcher::DelegateView::OnPaintBackground(gfx::Canvas* canvas) { if (!launcher_background) { ResourceBundle& rb = ResourceBundle::GetSharedInstance(); launcher_background = - rb.GetImageNamed(IDR_AURA_LAUNCHER_BACKGROUND).ToImageSkia(); + rb.GetImageNamed(IDR_AURA_LAUNCHER_BACKGROUND_BOTTOM).ToImageSkia(); } paint.setAlpha(alpha_); canvas->DrawImageInt( diff --git a/ash/launcher/launcher_button.cc b/ash/launcher/launcher_button.cc index fd1839b..b4c4f9b 100644 --- a/ash/launcher/launcher_button.cc +++ b/ash/launcher/launcher_button.cc @@ -354,18 +354,18 @@ void LauncherButton::UpdateState() { int bar_id; if (IsShelfHorizontal()) { 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)) - bar_id = IDR_AURA_LAUNCHER_UNDERLINE_HOVER; + bar_id = IDR_AURA_LAUNCHER_UNDERLINE_BOTTOM_HOVER; else - bar_id = IDR_AURA_LAUNCHER_UNDERLINE_RUNNING; + bar_id = IDR_AURA_LAUNCHER_UNDERLINE_BOTTOM_RUNNING; } else { 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)) - bar_id = IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_HOVER; + bar_id = IDR_AURA_LAUNCHER_UNDERLINE_LEFT_HOVER; else - bar_id = IDR_AURA_LAUNCHER_UNDERLINE_VERTICAL_RUNNING; + bar_id = IDR_AURA_LAUNCHER_UNDERLINE_LEFT_RUNNING; } ResourceBundle& rb = ResourceBundle::GetSharedInstance(); |