OLD | NEW |
---|---|
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 25 matching lines...) Expand all Loading... | |
36 #include "chrome/renderer/chrome_render_process_observer.h" | 36 #include "chrome/renderer/chrome_render_process_observer.h" |
37 #include "chrome/renderer/chrome_render_view_observer.h" | 37 #include "chrome/renderer/chrome_render_view_observer.h" |
38 #include "chrome/renderer/content_settings_observer.h" | 38 #include "chrome/renderer/content_settings_observer.h" |
39 #include "chrome/renderer/extensions/chrome_v8_context.h" | 39 #include "chrome/renderer/extensions/chrome_v8_context.h" |
40 #include "chrome/renderer/extensions/chrome_v8_extension.h" | 40 #include "chrome/renderer/extensions/chrome_v8_extension.h" |
41 #include "chrome/renderer/extensions/dispatcher.h" | 41 #include "chrome/renderer/extensions/dispatcher.h" |
42 #include "chrome/renderer/extensions/extension_helper.h" | 42 #include "chrome/renderer/extensions/extension_helper.h" |
43 #include "chrome/renderer/extensions/miscellaneous_bindings.h" | 43 #include "chrome/renderer/extensions/miscellaneous_bindings.h" |
44 #include "chrome/renderer/extensions/resource_request_policy.h" | 44 #include "chrome/renderer/extensions/resource_request_policy.h" |
45 #include "chrome/renderer/external_extension.h" | 45 #include "chrome/renderer/external_extension.h" |
46 #include "chrome/renderer/favicon_helper.h" | |
46 #include "chrome/renderer/loadtimes_extension_bindings.h" | 47 #include "chrome/renderer/loadtimes_extension_bindings.h" |
47 #include "chrome/renderer/net/renderer_net_predictor.h" | 48 #include "chrome/renderer/net/renderer_net_predictor.h" |
48 #include "chrome/renderer/page_click_tracker.h" | 49 #include "chrome/renderer/page_click_tracker.h" |
49 #include "chrome/renderer/page_load_histograms.h" | 50 #include "chrome/renderer/page_load_histograms.h" |
50 #include "chrome/renderer/pepper/chrome_ppapi_interfaces.h" | 51 #include "chrome/renderer/pepper/chrome_ppapi_interfaces.h" |
51 #include "chrome/renderer/pepper/pepper_helper.h" | 52 #include "chrome/renderer/pepper/pepper_helper.h" |
52 #include "chrome/renderer/playback_extension.h" | 53 #include "chrome/renderer/playback_extension.h" |
53 #include "chrome/renderer/plugins/plugin_placeholder.h" | 54 #include "chrome/renderer/plugins/plugin_placeholder.h" |
54 #include "chrome/renderer/plugins/plugin_uma.h" | 55 #include "chrome/renderer/plugins/plugin_uma.h" |
55 #include "chrome/renderer/prerender/prerender_dispatcher.h" | 56 #include "chrome/renderer/prerender/prerender_dispatcher.h" |
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
269 new PasswordGenerationManager(render_view); | 270 new PasswordGenerationManager(render_view); |
270 } | 271 } |
271 PageClickTracker* page_click_tracker = new PageClickTracker(render_view); | 272 PageClickTracker* page_click_tracker = new PageClickTracker(render_view); |
272 // Note that the order of insertion of the listeners is important. | 273 // Note that the order of insertion of the listeners is important. |
273 // The password_autocomplete_manager takes the first shot at processing the | 274 // The password_autocomplete_manager takes the first shot at processing the |
274 // notification and can stop the propagation. | 275 // notification and can stop the propagation. |
275 page_click_tracker->AddListener(password_autofill_manager); | 276 page_click_tracker->AddListener(password_autofill_manager); |
276 page_click_tracker->AddListener(autofill_agent); | 277 page_click_tracker->AddListener(autofill_agent); |
277 | 278 |
278 TranslateHelper* translate = new TranslateHelper(render_view); | 279 TranslateHelper* translate = new TranslateHelper(render_view); |
280 FaviconHelper* favicon = new FaviconHelper(render_view); | |
joth
2012/10/24 22:02:23
whitespace nit
Cait (Slow)
2012/10/25 20:29:23
Done.
| |
279 new ChromeRenderViewObserver( | 281 new ChromeRenderViewObserver( |
280 render_view, content_settings, chrome_observer_.get(), | 282 render_view, content_settings, chrome_observer_.get(), |
281 extension_dispatcher_.get(), translate); | 283 extension_dispatcher_.get(), translate, favicon); |
282 | 284 |
283 new PepperHelper(render_view); | 285 new PepperHelper(render_view); |
284 | 286 |
285 // Used only for testing/automation. | 287 // Used only for testing/automation. |
286 if (CommandLine::ForCurrentProcess()->HasSwitch( | 288 if (CommandLine::ForCurrentProcess()->HasSwitch( |
287 switches::kDomAutomationController)) { | 289 switches::kDomAutomationController)) { |
288 new AutomationRendererHelper(render_view); | 290 new AutomationRendererHelper(render_view); |
289 } | 291 } |
290 } | 292 } |
291 | 293 |
(...skipping 693 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
985 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() { | 987 bool ChromeContentRendererClient::IsOtherExtensionWithWebRequestInstalled() { |
986 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled(); | 988 return extension_dispatcher_->IsOtherExtensionWithWebRequestInstalled(); |
987 } | 989 } |
988 | 990 |
989 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( | 991 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( |
990 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { | 992 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { |
991 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); | 993 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); |
992 } | 994 } |
993 | 995 |
994 } // namespace chrome | 996 } // namespace chrome |
OLD | NEW |