Remove the unused chrome frame resources and merge things into a single .grd file in preparation for localizing Chrome Frame.

BUG=24305
TEST=none

Review URL: http://codereview.chromium.org/1055002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41835 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 3 insertions, 48 deletions

diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index e16be31..e589881 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -551,7 +551,6 @@
       ],
       'sources': [
         # Localizable resources.
-        'resources/chrome_frame_strings.grd',
         'resources/chrome_frame_resources.grd',
       ],
       'direct_dependent_settings': {
@@ -698,7 +697,6 @@
           ],
           'sources': [
             '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_frame_resources.rc',
-            '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_frame_strings.rc',
           ],
           'dependencies': [
             '../breakpad/breakpad.gyp:breakpad_handler',
diff --git a/chrome_frame/chrome_frame_activex_base.h b/chrome_frame/chrome_frame_activex_base.h
index 5c8c2c4..c585766 100644
--- a/chrome_frame/chrome_frame_activex_base.h
+++ b/chrome_frame/chrome_frame_activex_base.h
@@ -36,7 +36,6 @@
 #include "base/scoped_variant_win.h"
 #include "base/string_util.h"
 #include "grit/chrome_frame_resources.h"
-#include "grit/chrome_frame_strings.h"
 #include "chrome_frame/chrome_frame_plugin.h"
 #include "chrome_frame/com_message_event.h"
 #include "chrome_frame/com_type_info_holder.h"
diff --git a/chrome_frame/resources/chrome_frame_resources.grd b/chrome_frame/resources/chrome_frame_resources.grd
index ea9f98f..ee6a846 100644
--- a/chrome_frame/resources/chrome_frame_resources.grd
+++ b/chrome_frame/resources/chrome_frame_resources.grd
@@ -21,11 +21,6 @@ for localizable strings
   </outputs>
   <release seq="1">
     <messages>
-      <!-- TODO(slightlyoff): should these be in chrome_frame_strings.grd
-             instead?  -->
-      <message name="IDS_PROJNAME">
-        ChromeTab
-      </message>
       <message name="IDS_VERSIONMISMATCH_HEADER">
         ChromeFrame Update.
       </message>
@@ -35,6 +30,9 @@ for localizable strings
       <message name="IDS_VERSIONUNKNOWN">
         Very old
       </message>
+      <message name="IDS_CHROME_FRAME_MENU_ABOUT" desc="About Chrome Frame label">
+        About Chrome Frame...
+      </message>
     </messages>
     <structures first_id="50000">
       <structure name="IDD_FIND_DIALOG" file="structured_resources.rc" type="dialog" >
diff --git a/chrome_frame/resources/chrome_frame_strings.grd b/chrome_frame/resources/chrome_frame_strings.grd
deleted file mode 100644
index 39bcfd9..0000000
--- a/chrome_frame/resources/chrome_frame_strings.grd
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- 
-Copyright (c) 2009 The Chromium Authors. All rights reserved.  Use of this
-source code is governed by a BSD-style license that can be found in the LICENSE
-file.
--->
-
-<!-- Definitions of resources that will be translated for each locale.
--->
-
-<grit base_dir="." latest_public_release="0" current_release="1"
-      source_lang_id="en" enc_check="möl">
-  <outputs>
-    <output filename="grit/chrome_frame_strings.h" type="rc_header">
-      <emit emit_type='prepend'></emit>
-    </output>
-    <output filename="chrome_frame_strings.rc" type="rc_all" lang="en" />
-  </outputs>
-  <translations>
-    <!--
-    <file path="chrome_frame_strings_en-GB.xtb" lang="en-GB" />
-    ...
-    -->
-  </translations>
-  <release seq="1" allow_pseudo="false">
-    <messages fallback_to_english="true" first_id="30000">
-    
-      <!-- Menus -->
-      <message name="IDS_CHROME_FRAME_MENU_ABOUT" desc="About Chrome Frame label">
-        About Chrome Frame...
-      </message>
-
-      <!-- General application strings -->
-      <message name="IDS_CHROME_FRAME_NAME" desc="Official plugin name.">
-        Google Chrome Frame
-      </message>
-    </messages>
-  </release>
-</grit>