diff options
| author | rahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-27 23:40:22 +0000 |
|---|---|---|
| committer | rahulk@google.com <rahulk@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-08-27 23:40:22 +0000 |
| commit | b08de9cd2ea9c8412134843fb4520cbed9a21d71 (patch) | |
| tree | bccf078792e1c05a7d3c62fcadddfde2ca19781e /chrome/browser/views/options | |
| parent | ef91a9b983a30a05668ef5ba3c4f26605ae6b467 (diff) | |
| download | chromium_src-b08de9cd2ea9c8412134843fb4520cbed9a21d71.zip chromium_src-b08de9cd2ea9c8412134843fb4520cbed9a21d71.tar.gz chromium_src-b08de9cd2ea9c8412134843fb4520cbed9a21d71.tar.bz2 | |
Remove Google Chrome specific strings from common resources file and use them from new resources file that is specific to only Google Chrome.
BUG=1110882
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@1473 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/options')
6 files changed, 13 insertions, 2 deletions
diff --git a/chrome/browser/views/options/advanced_contents_view.cc b/chrome/browser/views/options/advanced_contents_view.cc index c70d80e..1bb4343 100644 --- a/chrome/browser/views/options/advanced_contents_view.cc +++ b/chrome/browser/views/options/advanced_contents_view.cc @@ -41,6 +41,7 @@ #include "chrome/views/scroll_view.h" #include "net/base/ssl_config_service.h" +#include "chromium_strings.h" #include "generated_resources.h" namespace { diff --git a/chrome/browser/views/options/advanced_page_view.cc b/chrome/browser/views/options/advanced_page_view.cc index 7d7fc18..3476134 100644 --- a/chrome/browser/views/options/advanced_page_view.cc +++ b/chrome/browser/views/options/advanced_page_view.cc @@ -19,6 +19,8 @@ #include "chrome/views/native_button.h" #include "chrome/views/scroll_view.h" #include "chrome/views/window.h" + +#include "chromium_strings.h" #include "generated_resources.h" namespace { diff --git a/chrome/browser/views/options/fonts_languages_window_view.cc b/chrome/browser/views/options/fonts_languages_window_view.cc index 48d5cf7..fb87568 100644 --- a/chrome/browser/views/options/fonts_languages_window_view.cc +++ b/chrome/browser/views/options/fonts_languages_window_view.cc @@ -14,6 +14,8 @@ #include "chrome/common/pref_service.h" #include "chrome/common/resource_bundle.h" #include "chrome/views/window.h" + +#include "chromium_strings.h" #include "generated_resources.h" // static diff --git a/chrome/browser/views/options/general_page_view.cc b/chrome/browser/views/options/general_page_view.cc index 4dd8ec3..349fb5f 100644 --- a/chrome/browser/views/options/general_page_view.cc +++ b/chrome/browser/views/options/general_page_view.cc @@ -34,9 +34,11 @@ #include "chrome/views/radio_button.h" #include "chrome/views/table_view.h" #include "chrome/views/text_field.h" -#include "generated_resources.h" #include "skia/include/SkBitmap.h" +#include "chromium_strings.h" +#include "generated_resources.h" + static const int kStartupRadioGroup = 1; static const int kHomePageRadioGroup = 2; static const SkColor kDefaultBrowserLabelColor = SkColorSetRGB(0, 135, 0); diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc index 8563bcd..485e35b 100644 --- a/chrome/browser/views/options/languages_page_view.cc +++ b/chrome/browser/views/options/languages_page_view.cc @@ -34,10 +34,12 @@ #include "chrome/views/tabbed_pane.h" #include "chrome/views/text_field.h" #include "chrome/views/view_container.h" -#include "generated_resources.h" #include "skia/include/SkBitmap.h" #include "unicode/uloc.h" +#include "chromium_strings.h" +#include "generated_resources.h" + static const wchar_t* const g_supported_spellchecker_languages[] = { L"en-US", L"en-GB", diff --git a/chrome/browser/views/options/options_window_view.cc b/chrome/browser/views/options/options_window_view.cc index 9159410..97dfc7e 100644 --- a/chrome/browser/views/options/options_window_view.cc +++ b/chrome/browser/views/options/options_window_view.cc @@ -19,6 +19,8 @@ #include "chrome/views/tabbed_pane.h" #include "chrome/views/root_view.h" #include "chrome/views/window.h" + +#include "chromium_strings.h" #include "generated_resources.h" static const int kDefaultWindowWidthChars = 85; |