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

20 files changed, 37 insertions, 5 deletions

diff --git a/chrome/browser/views/about_chrome_view.cc b/chrome/browser/views/about_chrome_view.cc
index c4d40bb..fc0ec12 100644
--- a/chrome/browser/views/about_chrome_view.cc
+++ b/chrome/browser/views/about_chrome_view.cc
@@ -24,6 +24,7 @@
 #include "chrome/views/window.h"
 #include "webkit/glue/webkit_glue.h"
 
+#include "chromium_strings.h"
 #include "generated_resources.h"
 
 // The pixel width of the version text field. Ideally, we'd like to have the
diff --git a/chrome/browser/views/bookmark_editor_view.cc b/chrome/browser/views/bookmark_editor_view.cc
index 66a5f88..b8d4a11 100644
--- a/chrome/browser/views/bookmark_editor_view.cc
+++ b/chrome/browser/views/bookmark_editor_view.cc
@@ -18,9 +18,11 @@
 #include "chrome/views/grid_layout.h"
 #include "chrome/views/label.h"
 #include "chrome/views/window.h"
-#include "generated_resources.h"
 #include "googleurl/src/gurl.h"
 
+#include "chromium_strings.h"
+#include "generated_resources.h"
+
 using ChromeViews::ColumnSet;
 using ChromeViews::GridLayout;
 using ChromeViews::Label;
diff --git a/chrome/browser/views/bug_report_view.cc b/chrome/browser/views/bug_report_view.cc
index 7b55335..cbc592c 100644
--- a/chrome/browser/views/bug_report_view.cc
+++ b/chrome/browser/views/bug_report_view.cc
@@ -24,10 +24,12 @@
 #include "chrome/views/grid_layout.h"
 #include "chrome/views/label.h"
 #include "chrome/views/Window.h"
-#include "generated_resources.h"
 #include "net/base/escape.h"
 #include "unicode/locid.h"
 
+#include "chromium_strings.h"
+#include "generated_resources.h"
+
 using ChromeViews::ColumnSet;
 using ChromeViews::GridLayout;
 
diff --git a/chrome/browser/views/constrained_window_impl.cc b/chrome/browser/views/constrained_window_impl.cc
index 9ea3220..008cd81 100644
--- a/chrome/browser/views/constrained_window_impl.cc
+++ b/chrome/browser/views/constrained_window_impl.cc
@@ -30,9 +30,11 @@
 #include "chrome/views/focus_manager.h"
 #include "chrome/views/hwnd_view.h"
 #include "chrome/views/non_client_view.h"
-#include "generated_resources.h"
 #include "net/base/net_util.h"
 
+#include "chromium_strings.h"
+#include "generated_resources.h"
+
 namespace ChromeViews {
 class ClientView;
 }
diff --git a/chrome/browser/views/first_run_bubble.cc b/chrome/browser/views/first_run_bubble.cc
index b13fb18..0221814 100644
--- a/chrome/browser/views/first_run_bubble.cc
+++ b/chrome/browser/views/first_run_bubble.cc
@@ -18,6 +18,7 @@
 #include "chrome/views/native_button.h"
 #include "chrome/views/window.h"
 
+#include "chromium_strings.h"
 #include "generated_resources.h"
 
 namespace {
diff --git a/chrome/browser/views/first_run_customize_view.cc b/chrome/browser/views/first_run_customize_view.cc
index 0c124b4..a23524e 100644
--- a/chrome/browser/views/first_run_customize_view.cc
+++ b/chrome/browser/views/first_run_customize_view.cc
@@ -20,6 +20,7 @@
 #include "chrome/views/throbber.h"
 #include "chrome/views/window.h"
 
+#include "chromium_strings.h"
 #include "generated_resources.h"
 
 FirstRunCustomizeView::FirstRunCustomizeView(Profile* profile,
diff --git a/chrome/browser/views/first_run_view.cc b/chrome/browser/views/first_run_view.cc
index 731182b..690cd72 100644
--- a/chrome/browser/views/first_run_view.cc
+++ b/chrome/browser/views/first_run_view.cc
@@ -19,6 +19,7 @@
 #include "chrome/views/separator.h"
 #include "chrome/views/window.h"
 
+#include "chromium_strings.h"
 #include "generated_resources.h"
 
 namespace {
diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc
index cb08ab7..ab02f4c 100644
--- a/chrome/browser/views/frame/browser_view.cc
+++ b/chrome/browser/views/frame/browser_view.cc
@@ -16,6 +16,8 @@
 #include "chrome/browser/views/toolbar_star_toggle.h"
 #include "chrome/browser/views/toolbar_view.h"
 #include "chrome/common/l10n_util.h"
+
+#include "chromium_strings.h"
 #include "generated_resources.h"
 
 // Status Bubble metrics.
diff --git a/chrome/browser/views/frame/browser_view2.cc b/chrome/browser/views/frame/browser_view2.cc
index d6380c9..68a0325 100644
--- a/chrome/browser/views/frame/browser_view2.cc
+++ b/chrome/browser/views/frame/browser_view2.cc
@@ -26,6 +26,8 @@
 #include "chrome/common/win_util.h"
 #include "chrome/views/view.h"
 #include "chrome/views/window.h"
+
+#include "chromium_strings.h"
 #include "generated_resources.h"
 
 // static
diff --git a/chrome/browser/views/hung_renderer_view.cc b/chrome/browser/views/hung_renderer_view.cc
index 4b91dfe..fa1691d 100644
--- a/chrome/browser/views/hung_renderer_view.cc
+++ b/chrome/browser/views/hung_renderer_view.cc
@@ -22,6 +22,8 @@
 #include "chrome/views/group_table_view.h"
 #include "chrome/views/image_view.h"
 #include "chrome/views/native_button.h"
+
+#include "chromium_strings.h"
 #include "generated_resources.h"
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/views/importer_lock_view.cc b/chrome/browser/views/importer_lock_view.cc
index 6c56553b..d1c5f2f 100644
--- a/chrome/browser/views/importer_lock_view.cc
+++ b/chrome/browser/views/importer_lock_view.cc
@@ -9,6 +9,7 @@
 #include "chrome/common/l10n_util.h"
 #include "chrome/views/label.h"
 
+#include "chromium_strings.h"
 #include "generated_resources.h"
 
 using ChromeViews::ColumnSet;
diff --git a/chrome/browser/views/importing_progress_view.cc b/chrome/browser/views/importing_progress_view.cc
index 0d55d0e..8dbc8ec 100644
--- a/chrome/browser/views/importing_progress_view.cc
+++ b/chrome/browser/views/importing_progress_view.cc
@@ -11,6 +11,8 @@
 #include "chrome/views/label.h"
 #include "chrome/views/throbber.h"
 #include "chrome/views/window.h"
+
+#include "chromium_strings.h"
 #include "generated_resources.h"
 
 ////////////////////////////////////////////////////////////////////////////////
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;
diff --git a/chrome/browser/views/restart_message_box.cc b/chrome/browser/views/restart_message_box.cc
index f46a9d5..1cfafff 100644
--- a/chrome/browser/views/restart_message_box.cc
+++ b/chrome/browser/views/restart_message_box.cc
@@ -8,6 +8,7 @@
 #include "chrome/views/message_box_view.h"
 #include "chrome/views/window.h"
 
+#include "chromium_strings.h"
 #include "generated_resources.h"
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index 4baab1b..5a40f88 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -40,6 +40,7 @@
 #include "chrome/views/tooltip_manager.h"
 #include "net/base/net_util.h"
 
+#include "chromium_strings.h"
 #include "generated_resources.h"
 
 static const int kControlHorizOffset = 4;