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

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: Separates chrome.benchmarking.closeConnections() in order to remove --enable-benchmarking from tele… Created 7 years, 11 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 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/page_click_tracker.h" 52 #include "chrome/renderer/page_click_tracker.h"
52 #include "chrome/renderer/page_load_histograms.h" 53 #include "chrome/renderer/page_load_histograms.h"
53 #include "chrome/renderer/pepper/chrome_ppapi_interfaces.h" 54 #include "chrome/renderer/pepper/chrome_ppapi_interfaces.h"
54 #include "chrome/renderer/pepper/pepper_helper.h" 55 #include "chrome/renderer/pepper/pepper_helper.h"
55 #include "chrome/renderer/playback_extension.h" 56 #include "chrome/renderer/playback_extension.h"
56 #include "chrome/renderer/plugins/plugin_placeholder.h" 57 #include "chrome/renderer/plugins/plugin_placeholder.h"
57 #include "chrome/renderer/plugins/plugin_uma.h" 58 #include "chrome/renderer/plugins/plugin_uma.h"
58 #include "chrome/renderer/prerender/prerender_dispatcher.h" 59 #include "chrome/renderer/prerender/prerender_dispatcher.h"
59 #include "chrome/renderer/prerender/prerender_helper.h" 60 #include "chrome/renderer/prerender/prerender_helper.h"
60 #include "chrome/renderer/prerender/prerender_webmediaplayer.h" 61 #include "chrome/renderer/prerender/prerender_webmediaplayer.h"
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 #if defined(FULL_SAFE_BROWSING) 206 #if defined(FULL_SAFE_BROWSING)
206 thread->AddObserver(phishing_classifier_.get()); 207 thread->AddObserver(phishing_classifier_.get());
207 #endif 208 #endif
208 thread->AddObserver(spellcheck_.get()); 209 thread->AddObserver(spellcheck_.get());
209 thread->AddObserver(visited_link_slave_.get()); 210 thread->AddObserver(visited_link_slave_.get());
210 thread->AddObserver(prerender_dispatcher_.get()); 211 thread->AddObserver(prerender_dispatcher_.get());
211 212
212 thread->RegisterExtension(extensions_v8::ExternalExtension::Get()); 213 thread->RegisterExtension(extensions_v8::ExternalExtension::Get());
213 thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get()); 214 thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get());
214 thread->RegisterExtension(extensions_v8::SearchBoxExtension::Get()); 215 thread->RegisterExtension(extensions_v8::SearchBoxExtension::Get());
216 thread->RegisterExtension(extensions_v8::NetBenchmarkingExtension::Get());
tonyg 2013/01/24 22:00:29 This exposes closeConnection() to the web platform
Danh Nguyen 2013/02/07 16:56:32 Fixed. I've added --enable-net-benchmarking for t
215 217
216 CommandLine* command_line = CommandLine::ForCurrentProcess(); 218 CommandLine* command_line = CommandLine::ForCurrentProcess();
217 if (command_line->HasSwitch(switches::kEnableBenchmarking)) 219 if (command_line->HasSwitch(switches::kEnableBenchmarking))
218 thread->RegisterExtension(extensions_v8::BenchmarkingExtension::Get()); 220 thread->RegisterExtension(extensions_v8::BenchmarkingExtension::Get());
219 221
220 if (command_line->HasSwitch(switches::kPlaybackMode) || 222 if (command_line->HasSwitch(switches::kPlaybackMode) ||
221 command_line->HasSwitch(switches::kRecordMode) || 223 command_line->HasSwitch(switches::kRecordMode) ||
222 command_line->HasSwitch(switches::kNoJsRandomness)) { 224 command_line->HasSwitch(switches::kNoJsRandomness)) {
223 thread->RegisterExtension(extensions_v8::PlaybackExtension::Get()); 225 thread->RegisterExtension(extensions_v8::PlaybackExtension::Get());
224 } 226 }
(...skipping 813 matching lines...) Expand 10 before | Expand all | Expand 10 after
1038 } 1040 }
1039 1041
1040 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( 1042 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
1041 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { 1043 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
1042 #if defined(ENABLE_PLUGINS) 1044 #if defined(ENABLE_PLUGINS)
1043 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); 1045 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
1044 #endif 1046 #endif
1045 } 1047 }
1046 1048
1047 } // namespace chrome 1049 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698