Expand scope of bookmark manager resources to all component extension resources.

chrome/browser/extensions/extension_protocols.cc

 // Copyright (c) 2010 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.
 
 #include "chrome/browser/extensions/extension_protocols.h"
 
 #include <algorithm>
 
 #include "app/resource_bundle.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/thread_restrictions.h"
 #include "build/build_config.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host.h"
 #include "chrome/browser/renderer_host/resource_dispatcher_host_request_info.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_file_util.h"
 #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"
 #include "net/url_request/url_request_file_job.h"
 #include "net/url_request/url_request_simple_job.h"
 
 namespace {
 
 class URLRequestResourceBundleJob : public net::URLRequestSimpleJob {
  public:
@@ skipping 131 matching lines @@
       directory_path.DirName() == resources_path) {
     FilePath relative_path = directory_path.BaseName().Append(
         extension_file_util::ExtensionURLToRelativeFilePath(request->url()));
 #if defined(OS_WIN)
     relative_path = relative_path.NormalizeWindowsPathSeparators();
 #endif
 
     // 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);
       }
     }
   }
   // TODO(tc): Move all of these files into resources.pak so we don't break
   // when updating on Linux.
   ExtensionResource resource(extension_id, directory_path,
       extension_file_util::ExtensionURLToRelativeFilePath(request->url()));
 
   FilePath resource_file_path;
   {
@@ skipping 21 matching lines @@
 
   return new net::URLRequestFileJob(request, resource.GetFilePath());
 }
 
 void RegisterExtensionProtocols() {
   net::URLRequest::RegisterProtocolFactory(chrome::kExtensionScheme,
                                            &CreateExtensionURLRequestJob);
   net::URLRequest::RegisterProtocolFactory(chrome::kUserScriptScheme,
                                            &CreateUserScriptURLRequestJob);
 }