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/system/ime | |
| 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/system/ime')
| -rw-r--r-- | ash/system/ime/tray_ime.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ash/system/ime/tray_ime.cc b/ash/system/ime/tray_ime.cc index 0251490..5f72fbb 100644 --- a/ash/system/ime/tray_ime.cc +++ b/ash/system/ime/tray_ime.cc @@ -19,8 +19,8 @@ #include "base/logging.h" #include "base/timer.h" #include "base/utf_string_conversions.h" +#include "grit/ash_resources.h" #include "grit/ash_strings.h" -#include "grit/ui_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/font.h" |