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

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

Issue 10375021: Move Extension into extensions namespace (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Take 6 Created 8 years, 7 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
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 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h" 81 #include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityPolicy.h"
82 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h" 82 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
83 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError. h" 83 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLError. h"
84 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLReques t.h" 84 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLReques t.h"
85 #include "ui/base/l10n/l10n_util.h" 85 #include "ui/base/l10n/l10n_util.h"
86 #include "ui/base/resource/resource_bundle.h" 86 #include "ui/base/resource/resource_bundle.h"
87 #include "webkit/plugins/npapi/plugin_list.h" 87 #include "webkit/plugins/npapi/plugin_list.h"
88 #include "webkit/plugins/ppapi/plugin_module.h" 88 #include "webkit/plugins/ppapi/plugin_module.h"
89 #include "webkit/plugins/ppapi/ppapi_interface_factory.h" 89 #include "webkit/plugins/ppapi/ppapi_interface_factory.h"
90 90
91 using autofill::AutofillAgent;
92 using autofill::PasswordAutofillManager;
93 using autofill::PasswordGenerationManager;
94 using content::RenderThread;
95 using extensions::Extension;
91 using WebKit::WebCache; 96 using WebKit::WebCache;
92 using WebKit::WebConsoleMessage; 97 using WebKit::WebConsoleMessage;
93 using WebKit::WebDataSource; 98 using WebKit::WebDataSource;
94 using WebKit::WebDocument; 99 using WebKit::WebDocument;
95 using WebKit::WebFrame; 100 using WebKit::WebFrame;
96 using WebKit::WebPlugin; 101 using WebKit::WebPlugin;
102 using webkit::WebPluginInfo;
103 using webkit::WebPluginMimeType;
97 using WebKit::WebPluginParams; 104 using WebKit::WebPluginParams;
98 using WebKit::WebSecurityOrigin; 105 using WebKit::WebSecurityOrigin;
99 using WebKit::WebSecurityPolicy; 106 using WebKit::WebSecurityPolicy;
100 using WebKit::WebString; 107 using WebKit::WebString;
101 using WebKit::WebURL; 108 using WebKit::WebURL;
102 using WebKit::WebURLError; 109 using WebKit::WebURLError;
103 using WebKit::WebURLRequest; 110 using WebKit::WebURLRequest;
104 using WebKit::WebURLResponse; 111 using WebKit::WebURLResponse;
105 using WebKit::WebVector; 112 using WebKit::WebVector;
106 using autofill::AutofillAgent;
107 using autofill::PasswordAutofillManager;
108 using autofill::PasswordGenerationManager;
109 using content::RenderThread;
110 using webkit::WebPluginInfo;
111 using webkit::WebPluginMimeType;
112 113
113 namespace { 114 namespace {
114 115
115 static void AppendParams(const std::vector<string16>& additional_names, 116 static void AppendParams(const std::vector<string16>& additional_names,
116 const std::vector<string16>& additional_values, 117 const std::vector<string16>& additional_values,
117 WebVector<WebString>* existing_names, 118 WebVector<WebString>* existing_names,
118 WebVector<WebString>* existing_values) { 119 WebVector<WebString>* existing_values) {
119 DCHECK(additional_names.size() == additional_values.size()); 120 DCHECK(additional_names.size() == additional_values.size());
120 DCHECK(existing_names->size() == existing_values->size()); 121 DCHECK(existing_names->size() == existing_values->size());
121 122
(...skipping 794 matching lines...) Expand 10 before | Expand all | Expand 10 after
916 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() { 917 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() {
917 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled(); 918 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled();
918 } 919 }
919 920
920 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( 921 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
921 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { 922 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
922 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); 923 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
923 } 924 }
924 925
925 } // namespace chrome 926 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/renderer/chrome_content_renderer_client.h ('k') | chrome/renderer/extensions/app_bindings.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698