This fixes resource loading for the virtual keyboard.

BUG=none
TEST=the keyboard no longer 404s in touchui builds

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

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

6 files changed, 20 insertions, 13 deletions

diff --git a/chrome/browser/extensions/extension_protocols.cc b/chrome/browser/extensions/extension_protocols.cc
index 363e7fc..faa7ae9 100644
--- a/chrome/browser/extensions/extension_protocols.cc
+++ b/chrome/browser/extensions/extension_protocols.cc
@@ -23,7 +23,7 @@
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/url_constants.h"
 #include "googleurl/src/url_util.h"
-#include "grit/bookmark_manager_resources_map.h"
+#include "grit/component_extension_resources_map.h"
 #include "net/base/mime_util.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_request_error_job.h"
@@ -175,15 +175,15 @@ static net::URLRequestJob* CreateExtensionURLRequestJob(
     // TODO(tc): Make a map of FilePath -> resource ids so we don't have to
     // covert to FilePaths all the time.  This will be more useful as we add
     // more resources.
-    for (size_t i = 0; i < kBookmarkManagerResourcesSize; ++i) {
+    for (size_t i = 0; i < kComponentExtensionResourcesSize; ++i) {
       FilePath bm_resource_path =
-          FilePath().AppendASCII(kBookmarkManagerResources[i].name);
+          FilePath().AppendASCII(kComponentExtensionResources[i].name);
 #if defined(OS_WIN)
       bm_resource_path = bm_resource_path.NormalizeWindowsPathSeparators();
 #endif
       if (relative_path == bm_resource_path) {
         return new URLRequestResourceBundleJob(request, relative_path,
-            kBookmarkManagerResources[i].value);
+            kComponentExtensionResources[i].value);
       }
     }
   }
diff --git a/chrome/browser/resources/bookmark_manager_resources.grd b/chrome/browser/resources/component_extension_resources.grd
index 94bf63f..6afb147 100644
--- a/chrome/browser/resources/bookmark_manager_resources.grd
+++ b/chrome/browser/resources/component_extension_resources.grd
@@ -3,18 +3,22 @@
      without changes to the corresponding grd file. -->
 <grit latest_public_release="0" current_release="1">
   <outputs>
-    <output filename="grit/bookmark_manager_resources.h" type="rc_header">
+    <output filename="grit/component_extension_resources.h" type="rc_header">
       <emit emit_type='prepend'></emit>
     </output>
-    <output filename="grit/bookmark_manager_resources_map.cc" type="resource_file_map_source" />
-    <output filename="grit/bookmark_manager_resources_map.h" type="resource_map_header" />
-    <output filename="bookmark_manager_resources.pak" type="data_package" />
+    <output filename="grit/component_extension_resources_map.cc" type="resource_file_map_source" />
+    <output filename="grit/component_extension_resources_map.h" type="resource_map_header" />
+    <output filename="component_extension_resources.pak" type="data_package" />
   </outputs>
   <release seq="1">
     <includes>
       <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_MANAGER_RECENT" file="bookmark_manager/images/bookmark_manager_recent.png" type="BINDATA" />
       <include name="IDR_BOOKMARK_MANAGER_BOOKMARK_MANAGER_SEARCH" file="bookmark_manager/images/bookmark_manager_search.png" type="BINDATA" />
       <include name="IDR_BOOKMARK_MANAGER_MAIN" file="bookmark_manager/main.html" flattenhtml="true" type="BINDATA" />
+
+      <if expr="pp_ifdef('touchui')">
+        <include name="IDR_KEYBOARD_INDEX" file="keyboard/index.html" flattenhtml="true" type="BINDATA" />
+      </if>
     </includes>
   </release>
 </grit>
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index b58992af..2cd3079 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -59,7 +59,7 @@
       # These resources end up in resources.pak because they are resources
       # used by internal pages.  Putting them in a spearate pak file makes
       # it easier for us to reference them internally.
-      'browser/resources/bookmark_manager_resources.grd',
+      'browser/resources/component_extension_resources.grd',
       'browser/resources/net_internals_resources.grd',
       'browser/resources/shared_resources.grd'
     ],
@@ -482,6 +482,9 @@
             ['use_titlecase_in_grd_files==1', {
               'action': ['-D', 'use_titlecase'],
             }],
+            ['touchui==1', {
+              'action': ['-D', 'touchui'],
+            }],
           ],
           'message': 'Generating resources from <(RULE_INPUT_PATH)',
         },
@@ -1542,7 +1545,7 @@
               'action_name': 'repack_resources',
               'variables': {
                 'pak_inputs': [
-                  '<(grit_out_dir)/bookmark_manager_resources.pak',
+                  '<(grit_out_dir)/component_extension_resources.pak',
                   '<(grit_out_dir)/net_internals_resources.pak',
                   '<(grit_out_dir)/shared_resources.pak',
                 ],
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 7890784..906d16a 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -3519,7 +3519,7 @@
         'browser/zygote_main_linux.cc',
 
         # These files are generated by GRIT.
-        '<(grit_out_dir)/grit/bookmark_manager_resources_map.cc',
+        '<(grit_out_dir)/grit/component_extension_resources_map.cc',
         '<(grit_out_dir)/grit/shared_resources_map.cc',
         '<(grit_out_dir)/grit/theme_resources_map.cc',
       ],
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index b95d02e..f1f821c 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -385,7 +385,7 @@
                   'action_name': 'repack_resources',
                   'variables': {
                     'pak_inputs': [
-                      '<(grit_out_dir)/bookmark_manager_resources.pak',
+                      '<(grit_out_dir)/component_extension_resources.pak',
                       '<(grit_out_dir)/net_internals_resources.pak',
                       '<(grit_out_dir)/shared_resources.pak',
                     ],
diff --git a/tools/grit/resource_ids b/tools/grit/resource_ids
index 9b61a92..a8d06f6 100644
--- a/tools/grit/resource_ids
+++ b/tools/grit/resource_ids
@@ -14,7 +14,7 @@
   "chrome/browser/browser_resources.grd": {
     "includes": [500],
   },
-  "chrome/browser/resources/bookmark_manager_resources.grd": {
+  "chrome/browser/resources/component_extension_resources.grd": {
     "includes": [1000],
   },
   "chrome/browser/resources/net_internals_resources.grd": {