summaryrefslogtreecommitdiffstats
path: root/ash/wm
diff options
context:
space:
mode:
authorstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-25 18:43:56 +0000
committerstevenjb@chromium.org <stevenjb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-10-25 18:43:56 +0000
commite2e22a7ab44c2f49d856a9f840893c5462f52679 (patch)
treef0acf2c93a84cd98ab96f438da818e0e43e72ae3 /ash/wm
parent86e94f3a510b7e358b50bd35a0683d066a616c74 (diff)
downloadchromium_src-e2e22a7ab44c2f49d856a9f840893c5462f52679.zip
chromium_src-e2e22a7ab44c2f49d856a9f840893c5462f52679.tar.gz
chromium_src-e2e22a7ab44c2f49d856a9f840893c5462f52679.tar.bz2
Replace shadow assets
BUG=154959 R=xiyuan@chromium.org Review URL: https://chromiumcodereview.appspot.com/11185068 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164119 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/wm')
-rw-r--r--ash/wm/shadow.cc17
1 files changed, 9 insertions, 8 deletions
diff --git a/ash/wm/shadow.cc b/ash/wm/shadow.cc
index 7f5752d..8da5661 100644
--- a/ash/wm/shadow.cc
+++ b/ash/wm/shadow.cc
@@ -6,6 +6,7 @@
#include "ash/wm/image_grid.h"
#include "grit/ash_resources.h"
+#include "grit/ui_resources.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/compositor/scoped_layer_animation_settings.h"
@@ -147,15 +148,15 @@ void Shadow::UpdateImagesForStyle() {
break;
case STYLE_SMALL:
image_grid_->SetImages(
- &res.GetImageNamed(IDR_AURA_SHADOW_SMALL_TOP_LEFT),
- &res.GetImageNamed(IDR_AURA_SHADOW_SMALL_TOP),
- &res.GetImageNamed(IDR_AURA_SHADOW_SMALL_TOP_RIGHT),
- &res.GetImageNamed(IDR_AURA_SHADOW_SMALL_LEFT),
+ &res.GetImageNamed(IDR_WINDOW_BUBBLE_SHADOW_SMALL_TOP_LEFT),
+ &res.GetImageNamed(IDR_WINDOW_BUBBLE_SHADOW_SMALL_TOP),
+ &res.GetImageNamed(IDR_WINDOW_BUBBLE_SHADOW_SMALL_TOP_RIGHT),
+ &res.GetImageNamed(IDR_WINDOW_BUBBLE_SHADOW_SMALL_LEFT),
NULL,
- &res.GetImageNamed(IDR_AURA_SHADOW_SMALL_RIGHT),
- &res.GetImageNamed(IDR_AURA_SHADOW_SMALL_BOTTOM_LEFT),
- &res.GetImageNamed(IDR_AURA_SHADOW_SMALL_BOTTOM),
- &res.GetImageNamed(IDR_AURA_SHADOW_SMALL_BOTTOM_RIGHT));
+ &res.GetImageNamed(IDR_WINDOW_BUBBLE_SHADOW_SMALL_RIGHT),
+ &res.GetImageNamed(IDR_WINDOW_BUBBLE_SHADOW_SMALL_BOTTOM_LEFT),
+ &res.GetImageNamed(IDR_WINDOW_BUBBLE_SHADOW_SMALL_BOTTOM),
+ &res.GetImageNamed(IDR_WINDOW_BUBBLE_SHADOW_SMALL_BOTTOM_RIGHT));
break;
default:
NOTREACHED() << "Unhandled style " << style_;