diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 21:30:27 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-13 21:30:27 +0000 |
| commit | dbe3e4196d95a487248aaf45378ee38ca7cb8fcc (patch) | |
| tree | 0554857f7081eb5e26008dafd7ab19613b29b853 /ash/desktop_background | |
| parent | 399990cdd5dd0f57be84f5bcd13ff96c5185ac43 (diff) | |
| download | chromium_src-dbe3e4196d95a487248aaf45378ee38ca7cb8fcc.zip chromium_src-dbe3e4196d95a487248aaf45378ee38ca7cb8fcc.tar.gz chromium_src-dbe3e4196d95a487248aaf45378ee38ca7cb8fcc.tar.bz2 | |
(reland r156610)
add ash_resources.grd and necessary changes to use images in ash/resources
BUG=146034
TEST=none
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=156610
Review URL: https://codereview.chromium.org/10905242
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@156637 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, 0 insertions, 2 deletions
diff --git a/ash/desktop_background/desktop_background_controller.cc b/ash/desktop_background/desktop_background_controller.cc index 752eb1f..cb186ad 100644 --- a/ash/desktop_background/desktop_background_controller.cc +++ b/ash/desktop_background/desktop_background_controller.cc @@ -14,7 +14,6 @@ #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 7369304..c703786 100644 --- a/ash/desktop_background/desktop_background_view.cc +++ b/ash/desktop_background/desktop_background_view.cc @@ -14,7 +14,6 @@ #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" |