diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-26 04:29:34 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-26 04:29:34 +0000 |
| commit | b74b4885d8268a943bb9498abbe1d4a288d97f70 (patch) | |
| tree | 4712ab6d431d9587ba7e521c778d76721374e703 /ui/base/native_theme/native_theme_base.cc | |
| parent | a28efbdf67dbceeb9a95f60ac0b0d856c4f55f47 (diff) | |
| download | chromium_src-b74b4885d8268a943bb9498abbe1d4a288d97f70.zip chromium_src-b74b4885d8268a943bb9498abbe1d4a288d97f70.tar.gz chromium_src-b74b4885d8268a943bb9498abbe1d4a288d97f70.tar.bz2 | |
Merge native_theme resources into ui_resources_standard
BUG=124566
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10447003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139178 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/native_theme/native_theme_base.cc')
| -rw-r--r-- | ui/base/native_theme/native_theme_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/base/native_theme/native_theme_base.cc b/ui/base/native_theme/native_theme_base.cc index b79c0fa..d8d3d6f 100644 --- a/ui/base/native_theme/native_theme_base.cc +++ b/ui/base/native_theme/native_theme_base.cc @@ -7,7 +7,7 @@ #include <limits> #include "base/logging.h" -#include "grit/native_theme_resources.h" +#include "grit/ui_resources_standard.h" #include "third_party/skia/include/effects/SkGradientShader.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/canvas.h" |