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/tab_contents | |
| 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/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/spelling_bubble_model.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/tab_contents/tab_contents_ssl_helper.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/tab_contents/spelling_bubble_model.cc b/chrome/browser/tab_contents/spelling_bubble_model.cc index 5d96021..7760d5b 100644 --- a/chrome/browser/tab_contents/spelling_bubble_model.cc +++ b/chrome/browser/tab_contents/spelling_bubble_model.cc @@ -11,7 +11,7 @@ #include "chrome/common/url_constants.h" #include "content/public/browser/web_contents.h" #include "grit/generated_resources.h" -#include "grit/theme_resources_standard.h" +#include "grit/theme_resources.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" diff --git a/chrome/browser/tab_contents/tab_contents_ssl_helper.cc b/chrome/browser/tab_contents/tab_contents_ssl_helper.cc index cdd558e..6bbab3f 100644 --- a/chrome/browser/tab_contents/tab_contents_ssl_helper.cc +++ b/chrome/browser/tab_contents/tab_contents_ssl_helper.cc @@ -29,7 +29,7 @@ #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_view.h" #include "grit/generated_resources.h" -#include "grit/theme_resources_standard.h" +#include "grit/theme_resources.h" #include "net/base/net_errors.h" #include "net/base/x509_certificate.h" #include "ui/base/l10n/l10n_util.h" |