diff options
| author | benrg@chromium.org <benrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 22:20:23 +0000 |
|---|---|---|
| committer | benrg@chromium.org <benrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-11 22:20:23 +0000 |
| commit | 2a2813351eb4d5a4a5153c05340ddd04067cb297 (patch) | |
| tree | 4cd2d405ff5d664e4cd15b047fe9372e24379181 /chrome/browser/themes | |
| parent | ea4c3a94b41448c1173bc2b264efdd386d39282b (diff) | |
| download | chromium_src-2a2813351eb4d5a4a5153c05340ddd04067cb297.zip chromium_src-2a2813351eb4d5a4a5153c05340ddd04067cb297.tar.gz chromium_src-2a2813351eb4d5a4a5153c05340ddd04067cb297.tar.bz2 | |
This CL moves the contents of ui_resources_standard.grd into ui_resources.grd and theme_resources_standard.grd into theme_resources.grd. This also eliminates the following Grit outputs:
ui_resources.pak ==> duplicated in each scaled-resource pak
ui_resources_standard.h ==> merged into ui_resources.h
ui_resources_standard_map.h ==> renamed to ui_resources_map.h
ui_resources_standard_map.cc ==> renamed to ui_resources_map.cc
theme_resources.rc ==> merged into theme_resources_standard.rc
theme_resources.pak ==> duplicated in each scaled-resource pak
theme_resources_standard.h ==> merged into theme_resources.h
theme_resources_standard_map.h ==> merged into theme_resources_map.h
theme_resources_standard_map.cc ==> merged into theme_resources_map.cc
The image duplication is intentional; we may revisit this later.
Currently the standard-size images are included twice in the Windows build, once as an rc and once as a pak. I'll fix this in a followup CL.
TBR=ben@chromium.org,brettw@chromium.org,darin@chromium.org,stevenjb@chromium.org
BUG=133570
TEST=Trybots, local build
Review URL: https://chromiumcodereview.appspot.com/10756018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@146224 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/themes')
| -rw-r--r-- | chrome/browser/themes/browser_theme_pack.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/themes/browser_theme_pack_unittest.cc | 1 | ||||
| -rw-r--r-- | chrome/browser/themes/theme_service.cc | 2 |
3 files changed, 0 insertions, 5 deletions
diff --git a/chrome/browser/themes/browser_theme_pack.cc b/chrome/browser/themes/browser_theme_pack.cc index 1385a90..a51c110 100644 --- a/chrome/browser/themes/browser_theme_pack.cc +++ b/chrome/browser/themes/browser_theme_pack.cc @@ -16,9 +16,7 @@ #include "chrome/browser/themes/theme_service.h" #include "content/public/browser/browser_thread.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "grit/ui_resources.h" -#include "grit/ui_resources_standard.h" #include "net/base/file_stream.h" #include "net/base/net_errors.h" #include "third_party/skia/include/core/SkCanvas.h" diff --git a/chrome/browser/themes/browser_theme_pack_unittest.cc b/chrome/browser/themes/browser_theme_pack_unittest.cc index 3c7e6016..38e49d9 100644 --- a/chrome/browser/themes/browser_theme_pack_unittest.cc +++ b/chrome/browser/themes/browser_theme_pack_unittest.cc @@ -15,7 +15,6 @@ #include "chrome/common/chrome_paths.h" #include "content/public/test/test_browser_thread.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "testing/gtest/include/gtest/gtest.h" #include "ui/gfx/color_utils.h" diff --git a/chrome/browser/themes/theme_service.cc b/chrome/browser/themes/theme_service.cc index ba88fd5..331eb23 100644 --- a/chrome/browser/themes/theme_service.cc +++ b/chrome/browser/themes/theme_service.cc @@ -19,9 +19,7 @@ #include "content/public/browser/notification_service.h" #include "content/public/browser/user_metrics.h" #include "grit/theme_resources.h" -#include "grit/theme_resources_standard.h" #include "grit/ui_resources.h" -#include "grit/ui_resources_standard.h" #include "ui/base/layout.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image_skia.h" |