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

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

Issue 11411180: move favicon download code from chrome/ into content/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix order Created 8 years 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
« no previous file with comments | « chrome/common/icon_messages.h ('k') | chrome/renderer/chrome_render_view_observer.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 25 matching lines...) Expand all
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"
47 #include "chrome/renderer/loadtimes_extension_bindings.h" 46 #include "chrome/renderer/loadtimes_extension_bindings.h"
48 #include "chrome/renderer/net/renderer_net_predictor.h" 47 #include "chrome/renderer/net/renderer_net_predictor.h"
49 #include "chrome/renderer/page_click_tracker.h" 48 #include "chrome/renderer/page_click_tracker.h"
50 #include "chrome/renderer/page_load_histograms.h" 49 #include "chrome/renderer/page_load_histograms.h"
51 #include "chrome/renderer/pepper/chrome_ppapi_interfaces.h" 50 #include "chrome/renderer/pepper/chrome_ppapi_interfaces.h"
52 #include "chrome/renderer/pepper/pepper_helper.h" 51 #include "chrome/renderer/pepper/pepper_helper.h"
53 #include "chrome/renderer/playback_extension.h" 52 #include "chrome/renderer/playback_extension.h"
54 #include "chrome/renderer/plugins/plugin_placeholder.h" 53 #include "chrome/renderer/plugins/plugin_placeholder.h"
55 #include "chrome/renderer/plugins/plugin_uma.h" 54 #include "chrome/renderer/plugins/plugin_uma.h"
56 #include "chrome/renderer/prerender/prerender_dispatcher.h" 55 #include "chrome/renderer/prerender/prerender_dispatcher.h"
(...skipping 241 matching lines...) Expand 10 before | Expand all | Expand 10 after
298 297
299 TranslateHelper* translate = new TranslateHelper(render_view); 298 TranslateHelper* translate = new TranslateHelper(render_view);
300 new ChromeRenderViewObserver( 299 new ChromeRenderViewObserver(
301 render_view, content_settings, chrome_observer_.get(), 300 render_view, content_settings, chrome_observer_.get(),
302 extension_dispatcher_.get(), translate); 301 extension_dispatcher_.get(), translate);
303 302
304 #if defined(ENABLE_PLUGINS) 303 #if defined(ENABLE_PLUGINS)
305 new PepperHelper(render_view); 304 new PepperHelper(render_view);
306 #endif 305 #endif
307 306
308 // FaviconHelper will delete itself when render_view is destroyed.
309 new FaviconHelper(render_view);
310 // Used only for testing/automation. 307 // Used only for testing/automation.
311 if (CommandLine::ForCurrentProcess()->HasSwitch( 308 if (CommandLine::ForCurrentProcess()->HasSwitch(
312 switches::kDomAutomationController)) { 309 switches::kDomAutomationController)) {
313 new AutomationRendererHelper(render_view); 310 new AutomationRendererHelper(render_view);
314 } 311 }
315 } 312 }
316 313
317 void ChromeContentRendererClient::SetNumberOfViews(int number_of_views) { 314 void ChromeContentRendererClient::SetNumberOfViews(int number_of_views) {
318 child_process_logging::SetNumberOfViews(number_of_views); 315 child_process_logging::SetNumberOfViews(number_of_views);
319 } 316 }
(...skipping 708 matching lines...) Expand 10 before | Expand all | Expand 10 after
1028 } 1025 }
1029 1026
1030 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( 1027 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
1031 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { 1028 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
1032 #if defined(ENABLE_PLUGINS) 1029 #if defined(ENABLE_PLUGINS)
1033 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); 1030 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
1034 #endif 1031 #endif
1035 } 1032 }
1036 1033
1037 } // namespace chrome 1034 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/common/icon_messages.h ('k') | chrome/renderer/chrome_render_view_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698