Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(594)

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.cc

Issue 12091115: Allow manifest handlers to declare keys they depend on that must be parsed before them. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/renderer/chrome_content_renderer_client.h" 5 #include "chrome/renderer/chrome_content_renderer_client.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 using WebKit::WebURLResponse; 121 using WebKit::WebURLResponse;
122 using WebKit::WebVector; 122 using WebKit::WebVector;
123 123
124 namespace { 124 namespace {
125 125
126 // Explicitly register all extension ManifestHandlers needed to parse 126 // Explicitly register all extension ManifestHandlers needed to parse
127 // fields used in the renderer. 127 // fields used in the renderer.
128 void RegisterExtensionManifestHandlers() { 128 void RegisterExtensionManifestHandlers() {
129 extensions::ManifestHandler::Register( 129 extensions::ManifestHandler::Register(
130 extension_manifest_keys::kDevToolsPage, 130 extension_manifest_keys::kDevToolsPage,
131 new extensions::DevToolsPageHandler); 131 make_linked_ptr(new extensions::DevToolsPageHandler));
132 extensions::ManifestHandler::Register( 132 extensions::ManifestHandler::Register(
133 extension_manifest_keys::kWebAccessibleResources, 133 extension_manifest_keys::kWebAccessibleResources,
134 new extensions::WebAccessibleResourcesHandler); 134 make_linked_ptr(new extensions::WebAccessibleResourcesHandler));
135 } 135 }
136 136
137 static void AppendParams(const std::vector<string16>& additional_names, 137 static void AppendParams(const std::vector<string16>& additional_names,
138 const std::vector<string16>& additional_values, 138 const std::vector<string16>& additional_values,
139 WebVector<WebString>* existing_names, 139 WebVector<WebString>* existing_names,
140 WebVector<WebString>* existing_values) { 140 WebVector<WebString>* existing_values) {
141 DCHECK(additional_names.size() == additional_values.size()); 141 DCHECK(additional_names.size() == additional_values.size());
142 DCHECK(existing_names->size() == existing_values->size()); 142 DCHECK(existing_names->size() == existing_values->size());
143 143
144 size_t existing_size = existing_names->size(); 144 size_t existing_size = existing_names->size();
(...skipping 910 matching lines...) Expand 10 before | Expand all | Expand 10 after
1055 } 1055 }
1056 1056
1057 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( 1057 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
1058 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { 1058 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
1059 #if defined(ENABLE_PLUGINS) 1059 #if defined(ENABLE_PLUGINS)
1060 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); 1060 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
1061 #endif 1061 #endif
1062 } 1062 }
1063 1063
1064 } // namespace chrome 1064 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698