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

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

Issue 11801024: Fixed browser crash when using Debug build: (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed failure on win perf bot. 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
« no previous file with comments | « chrome/renderer/benchmarking_extension.cc ('k') | chrome/renderer/net_benchmarking_extension.h » ('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 30 matching lines...) Expand all
41 #include "chrome/renderer/content_settings_observer.h" 41 #include "chrome/renderer/content_settings_observer.h"
42 #include "chrome/renderer/extensions/chrome_v8_context.h" 42 #include "chrome/renderer/extensions/chrome_v8_context.h"
43 #include "chrome/renderer/extensions/chrome_v8_extension.h" 43 #include "chrome/renderer/extensions/chrome_v8_extension.h"
44 #include "chrome/renderer/extensions/dispatcher.h" 44 #include "chrome/renderer/extensions/dispatcher.h"
45 #include "chrome/renderer/extensions/extension_helper.h" 45 #include "chrome/renderer/extensions/extension_helper.h"
46 #include "chrome/renderer/extensions/miscellaneous_bindings.h" 46 #include "chrome/renderer/extensions/miscellaneous_bindings.h"
47 #include "chrome/renderer/extensions/resource_request_policy.h" 47 #include "chrome/renderer/extensions/resource_request_policy.h"
48 #include "chrome/renderer/external_extension.h" 48 #include "chrome/renderer/external_extension.h"
49 #include "chrome/renderer/loadtimes_extension_bindings.h" 49 #include "chrome/renderer/loadtimes_extension_bindings.h"
50 #include "chrome/renderer/net/renderer_net_predictor.h" 50 #include "chrome/renderer/net/renderer_net_predictor.h"
51 #include "chrome/renderer/net_benchmarking_extension.h"
51 #include "chrome/renderer/one_click_signin_agent.h" 52 #include "chrome/renderer/one_click_signin_agent.h"
52 #include "chrome/renderer/page_click_tracker.h" 53 #include "chrome/renderer/page_click_tracker.h"
53 #include "chrome/renderer/page_load_histograms.h" 54 #include "chrome/renderer/page_load_histograms.h"
54 #include "chrome/renderer/pepper/chrome_ppapi_interfaces.h" 55 #include "chrome/renderer/pepper/chrome_ppapi_interfaces.h"
55 #include "chrome/renderer/pepper/pepper_helper.h" 56 #include "chrome/renderer/pepper/pepper_helper.h"
56 #include "chrome/renderer/playback_extension.h" 57 #include "chrome/renderer/playback_extension.h"
57 #include "chrome/renderer/plugins/plugin_placeholder.h" 58 #include "chrome/renderer/plugins/plugin_placeholder.h"
58 #include "chrome/renderer/plugins/plugin_uma.h" 59 #include "chrome/renderer/plugins/plugin_uma.h"
59 #include "chrome/renderer/prerender/prerender_dispatcher.h" 60 #include "chrome/renderer/prerender/prerender_dispatcher.h"
60 #include "chrome/renderer/prerender/prerender_helper.h" 61 #include "chrome/renderer/prerender/prerender_helper.h"
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
225 thread->AddObserver(visited_link_slave_.get()); 226 thread->AddObserver(visited_link_slave_.get());
226 thread->AddObserver(prerender_dispatcher_.get()); 227 thread->AddObserver(prerender_dispatcher_.get());
227 228
228 thread->RegisterExtension(extensions_v8::ExternalExtension::Get()); 229 thread->RegisterExtension(extensions_v8::ExternalExtension::Get());
229 thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get()); 230 thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get());
230 thread->RegisterExtension(extensions_v8::SearchBoxExtension::Get()); 231 thread->RegisterExtension(extensions_v8::SearchBoxExtension::Get());
231 232
232 CommandLine* command_line = CommandLine::ForCurrentProcess(); 233 CommandLine* command_line = CommandLine::ForCurrentProcess();
233 if (command_line->HasSwitch(switches::kEnableBenchmarking)) 234 if (command_line->HasSwitch(switches::kEnableBenchmarking))
234 thread->RegisterExtension(extensions_v8::BenchmarkingExtension::Get()); 235 thread->RegisterExtension(extensions_v8::BenchmarkingExtension::Get());
236 if (command_line->HasSwitch(switches::kEnableNetBenchmarking))
237 thread->RegisterExtension(extensions_v8::NetBenchmarkingExtension::Get());
235 238
236 if (command_line->HasSwitch(switches::kPlaybackMode) || 239 if (command_line->HasSwitch(switches::kPlaybackMode) ||
237 command_line->HasSwitch(switches::kRecordMode) || 240 command_line->HasSwitch(switches::kRecordMode) ||
238 command_line->HasSwitch(switches::kNoJsRandomness)) { 241 command_line->HasSwitch(switches::kNoJsRandomness)) {
239 thread->RegisterExtension(extensions_v8::PlaybackExtension::Get()); 242 thread->RegisterExtension(extensions_v8::PlaybackExtension::Get());
240 } 243 }
241 244
242 if (command_line->HasSwitch(switches::kEnableIPCFuzzing)) { 245 if (command_line->HasSwitch(switches::kEnableIPCFuzzing)) {
243 thread->GetChannel()->set_outgoing_message_filter(LoadExternalIPCFuzzer()); 246 thread->GetChannel()->set_outgoing_message_filter(LoadExternalIPCFuzzer());
244 } 247 }
(...skipping 828 matching lines...) Expand 10 before | Expand all | Expand 10 after
1073 } 1076 }
1074 1077
1075 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( 1078 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
1076 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { 1079 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
1077 #if defined(ENABLE_PLUGINS) 1080 #if defined(ENABLE_PLUGINS)
1078 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); 1081 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
1079 #endif 1082 #endif
1080 } 1083 }
1081 1084
1082 } // namespace chrome 1085 } // namespace chrome
OLDNEW
« no previous file with comments | « chrome/renderer/benchmarking_extension.cc ('k') | chrome/renderer/net_benchmarking_extension.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698