diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 20:13:25 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 20:13:25 +0000 |
| commit | 57506de01a982ec0a3aad7ba80323f4048ab8197 (patch) | |
| tree | ed0ae521837a643ff5b873542cf6d047b8e5fae5 /ash/desktop_background | |
| parent | 5666725bc5c72d2b5a33edd36a411a68be607a98 (diff) | |
| download | chromium_src-57506de01a982ec0a3aad7ba80323f4048ab8197.zip chromium_src-57506de01a982ec0a3aad7ba80323f4048ab8197.tar.gz chromium_src-57506de01a982ec0a3aad7ba80323f4048ab8197.tar.bz2 | |
Revert r156610 "add ash_resources.grd and necessary changes to use images in ash/resources"
TBR=oshima@chromium.org
BUG=146034
TEST=none
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156614 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/desktop_background')
| -rw-r--r-- | ash/desktop_background/desktop_background_controller.cc | 1 | ||||
| -rw-r--r-- | ash/desktop_background/desktop_background_view.cc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc index cb186ad..752eb1f 100644 --- a/ash/desktop_background/desktop_background_controller.cc +++ b/ash/desktop_background/desktop_background_controller.cc @@ -14,6 +14,7 @@ #include "base/logging.h" #include "base/synchronization/cancellation_flag.h" #include "base/threading/worker_pool.h" +#include "grit/ui_resources.h" #include "ui/aura/root_window.h" #include "ui/aura/window.h" #include "ui/base/resource/resource_bundle.h" diff --git a/ash/desktop_background/desktop_background_view.cc b/ash/desktop_background/desktop_background_view.cc index c703786..7369304 100644 --- a/ash/desktop_background/desktop_background_view.cc +++ b/ash/desktop_background/desktop_background_view.cc @@ -14,6 +14,7 @@ #include "ash/wm/window_animations.h" #include "base/message_loop.h" #include "base/utf_string_conversions.h" +#include "grit/ui_resources.h" #include "ui/aura/root_window.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/layer.h" |