diff options
| author | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-12 17:14:07 +0000 |
|---|---|---|
| committer | tc@google.com <tc@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-12 17:14:07 +0000 |
| commit | 79a634351d4c69ce9570ab5ec952556347891db7 (patch) | |
| tree | e43e152e410305fd28c637d990fcf863623c427b /chrome/browser/views/options | |
| parent | e7736d75f1a69e8af68ca3d5610bce84c215cf0e (diff) | |
| download | chromium_src-79a634351d4c69ce9570ab5ec952556347891db7.zip chromium_src-79a634351d4c69ce9570ab5ec952556347891db7.tar.gz chromium_src-79a634351d4c69ce9570ab5ec952556347891db7.tar.bz2 | |
Second try of landing chrome_resources project. Changes from last time:
- fix scons dependencies by adding a target for grit/theme_resources.h
- fix mac build by adding grit to unittest include path
- fix check deps by adding rules for /grit dir.
Create a chrome_resources.vcproj that holds grd files that hold
non-string resources. Put browser_resources.grd into this vcproj.
Port theme_resources.rc/theme_resources.h to theme_resources.grd
and put it in the vcproj too.
I did a find/replace on the theme_resources include line.
Modify grit so header files go in grit_generated_resources/grit/
so the include path can be cleaner. I'll migrate the others
in follow up patches.
theme_resources.rc had a conditional include of distribution_resources.rc
so I had to add support for preprocessor defines to visual studio.
Review URL: http://codereview.chromium.org/24011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9664 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/options')
5 files changed, 5 insertions, 5 deletions
diff --git a/chrome/browser/views/options/content_page_view.cc b/chrome/browser/views/options/content_page_view.cc index 579158e8..5ca51cb 100644 --- a/chrome/browser/views/options/content_page_view.cc +++ b/chrome/browser/views/options/content_page_view.cc @@ -11,7 +11,7 @@ #include "base/file_util.h" #include "base/gfx/native_theme.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/shell_dialogs.h" #include "chrome/browser/views/options/fonts_languages_window_view.h" diff --git a/chrome/browser/views/options/cookies_view.cc b/chrome/browser/views/options/cookies_view.cc index f1af2d8..f33f104 100644 --- a/chrome/browser/views/options/cookies_view.cc +++ b/chrome/browser/views/options/cookies_view.cc @@ -9,7 +9,7 @@ #include "base/string_util.h" #include "base/time_format.h" #include "chrome/app/locales/locale_settings.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/profile.h" #include "chrome/browser/views/standard_layout.h" #include "chrome/common/gfx/color_utils.h" diff --git a/chrome/browser/views/options/fonts_page_view.cc b/chrome/browser/views/options/fonts_page_view.cc index d73191b..3f41bbd 100644 --- a/chrome/browser/views/options/fonts_page_view.cc +++ b/chrome/browser/views/options/fonts_page_view.cc @@ -11,7 +11,7 @@ #include "base/file_util.h" #include "base/gfx/native_theme.h" #include "base/string_util.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/app/locales/locale_settings.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/character_encoding.h" diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc index e8f19f5..ae81849 100644 --- a/chrome/browser/views/options/general_page_view.cc +++ b/chrome/browser/views/options/general_page_view.cc @@ -8,7 +8,7 @@ #include "base/message_loop.h" #include "base/string_util.h" #include "base/thread.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_list.h" #include "chrome/browser/browser_process.h" diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc index 62bcf81..0252d7d 100644 --- a/chrome/browser/views/options/languages_page_view.cc +++ b/chrome/browser/views/options/languages_page_view.cc @@ -12,7 +12,7 @@ #include "base/string_util.h" #include "base/gfx/native_theme.h" #include "base/string_util.h" -#include "chrome/app/theme/theme_resources.h" +#include "grit/theme_resources.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/shell_dialogs.h" #include "chrome/browser/spellchecker.h" |