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

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

Issue 12386019: Instant: Use only one hidden WebContents per profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 #include "chrome/renderer/playback_extension.h" 58 #include "chrome/renderer/playback_extension.h"
59 #include "chrome/renderer/plugins/plugin_placeholder.h" 59 #include "chrome/renderer/plugins/plugin_placeholder.h"
60 #include "chrome/renderer/plugins/plugin_uma.h" 60 #include "chrome/renderer/plugins/plugin_uma.h"
61 #include "chrome/renderer/prerender/prerender_dispatcher.h" 61 #include "chrome/renderer/prerender/prerender_dispatcher.h"
62 #include "chrome/renderer/prerender/prerender_helper.h" 62 #include "chrome/renderer/prerender/prerender_helper.h"
63 #include "chrome/renderer/prerender/prerender_webmediaplayer.h" 63 #include "chrome/renderer/prerender/prerender_webmediaplayer.h"
64 #include "chrome/renderer/prerender/prerenderer_client.h" 64 #include "chrome/renderer/prerender/prerenderer_client.h"
65 #include "chrome/renderer/printing/print_web_view_helper.h" 65 #include "chrome/renderer/printing/print_web_view_helper.h"
66 #include "chrome/renderer/safe_browsing/malware_dom_details.h" 66 #include "chrome/renderer/safe_browsing/malware_dom_details.h"
67 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h" 67 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
68 #include "chrome/renderer/searchbox/embedded_searchbox.h"
69 #include "chrome/renderer/searchbox/embedded_searchbox_extension.h"
68 #include "chrome/renderer/searchbox/searchbox.h" 70 #include "chrome/renderer/searchbox/searchbox.h"
69 #include "chrome/renderer/searchbox/searchbox_extension.h" 71 #include "chrome/renderer/searchbox/searchbox_extension.h"
70 #include "chrome/renderer/spellchecker/spellcheck.h" 72 #include "chrome/renderer/spellchecker/spellcheck.h"
71 #include "chrome/renderer/spellchecker/spellcheck_provider.h" 73 #include "chrome/renderer/spellchecker/spellcheck_provider.h"
72 #include "components/visitedlink/renderer/visitedlink_slave.h" 74 #include "components/visitedlink/renderer/visitedlink_slave.h"
73 #include "content/public/common/content_constants.h" 75 #include "content/public/common/content_constants.h"
74 #include "content/public/renderer/render_thread.h" 76 #include "content/public/renderer/render_thread.h"
75 #include "content/public/renderer/render_view.h" 77 #include "content/public/renderer/render_view.h"
76 #include "content/public/renderer/render_view_visitor.h" 78 #include "content/public/renderer/render_view_visitor.h"
77 #include "extensions/common/constants.h" 79 #include "extensions/common/constants.h"
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 thread->AddObserver(extension_dispatcher_.get()); 224 thread->AddObserver(extension_dispatcher_.get());
223 #if defined(FULL_SAFE_BROWSING) 225 #if defined(FULL_SAFE_BROWSING)
224 thread->AddObserver(phishing_classifier_.get()); 226 thread->AddObserver(phishing_classifier_.get());
225 #endif 227 #endif
226 thread->AddObserver(spellcheck_.get()); 228 thread->AddObserver(spellcheck_.get());
227 thread->AddObserver(visited_link_slave_.get()); 229 thread->AddObserver(visited_link_slave_.get());
228 thread->AddObserver(prerender_dispatcher_.get()); 230 thread->AddObserver(prerender_dispatcher_.get());
229 231
230 thread->RegisterExtension(extensions_v8::ExternalExtension::Get()); 232 thread->RegisterExtension(extensions_v8::ExternalExtension::Get());
231 thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get()); 233 thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get());
232 thread->RegisterExtension(extensions_v8::SearchBoxExtension::Get());
233 234
234 CommandLine* command_line = CommandLine::ForCurrentProcess(); 235 CommandLine* command_line = CommandLine::ForCurrentProcess();
236
237 if (command_line->HasSwitch(switches::kInstantProcess)) {
238 if (command_line->HasSwitch(switches::kEnableInstantExtendedAPI)) {
239 thread->RegisterExtension(
240 extensions_v8::EmbeddedSearchBoxExtension::Get());
241 } else {
242 thread->RegisterExtension(extensions_v8::SearchBoxExtension::Get());
243 }
244 }
245
235 if (command_line->HasSwitch(switches::kEnableBenchmarking)) 246 if (command_line->HasSwitch(switches::kEnableBenchmarking))
236 thread->RegisterExtension(extensions_v8::BenchmarkingExtension::Get()); 247 thread->RegisterExtension(extensions_v8::BenchmarkingExtension::Get());
237 if (command_line->HasSwitch(switches::kEnableNetBenchmarking)) 248 if (command_line->HasSwitch(switches::kEnableNetBenchmarking))
238 thread->RegisterExtension(extensions_v8::NetBenchmarkingExtension::Get()); 249 thread->RegisterExtension(extensions_v8::NetBenchmarkingExtension::Get());
239 250
240 if (command_line->HasSwitch(switches::kPlaybackMode) || 251 if (command_line->HasSwitch(switches::kPlaybackMode) ||
241 command_line->HasSwitch(switches::kRecordMode) || 252 command_line->HasSwitch(switches::kRecordMode) ||
242 command_line->HasSwitch(switches::kNoJsRandomness)) { 253 command_line->HasSwitch(switches::kNoJsRandomness)) {
243 thread->RegisterExtension(extensions_v8::PlaybackExtension::Get()); 254 thread->RegisterExtension(extensions_v8::PlaybackExtension::Get());
244 } 255 }
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 new ContentSettingsObserver(render_view); 314 new ContentSettingsObserver(render_view);
304 if (chrome_observer_.get()) { 315 if (chrome_observer_.get()) {
305 content_settings->SetContentSettingRules( 316 content_settings->SetContentSettingRules(
306 chrome_observer_->content_setting_rules()); 317 chrome_observer_->content_setting_rules());
307 } 318 }
308 new extensions::ExtensionHelper(render_view, extension_dispatcher_.get()); 319 new extensions::ExtensionHelper(render_view, extension_dispatcher_.get());
309 new PageLoadHistograms(render_view); 320 new PageLoadHistograms(render_view);
310 #if defined(ENABLE_PRINTING) 321 #if defined(ENABLE_PRINTING)
311 new printing::PrintWebViewHelper(render_view); 322 new printing::PrintWebViewHelper(render_view);
312 #endif 323 #endif
313 new SearchBox(render_view); 324 CommandLine* command_line = CommandLine::ForCurrentProcess();
325 if (command_line->HasSwitch(switches::kInstantProcess)) {
326 if (command_line->HasSwitch(switches::kEnableInstantExtendedAPI))
327 new EmbeddedSearchBox(render_view);
328 else
329 new SearchBox(render_view);
330 }
314 new SpellCheckProvider(render_view, spellcheck_.get()); 331 new SpellCheckProvider(render_view, spellcheck_.get());
315 new prerender::PrerendererClient(render_view); 332 new prerender::PrerendererClient(render_view);
316 #if defined(FULL_SAFE_BROWSING) 333 #if defined(FULL_SAFE_BROWSING)
317 safe_browsing::MalwareDOMDetails::Create(render_view); 334 safe_browsing::MalwareDOMDetails::Create(render_view);
318 #endif 335 #endif
319 336
320 PasswordAutofillManager* password_autofill_manager = 337 PasswordAutofillManager* password_autofill_manager =
321 new PasswordAutofillManager(render_view); 338 new PasswordAutofillManager(render_view);
322 AutofillAgent* autofill_agent = new AutofillAgent(render_view, 339 AutofillAgent* autofill_agent = new AutofillAgent(render_view,
323 password_autofill_manager); 340 password_autofill_manager);
324 if (CommandLine::ForCurrentProcess()->HasSwitch( 341 if (command_line->HasSwitch(switches::kEnablePasswordGeneration))
325 switches::kEnablePasswordGeneration)) {
326 new PasswordGenerationManager(render_view); 342 new PasswordGenerationManager(render_view);
327 }
328 PageClickTracker* page_click_tracker = new PageClickTracker(render_view); 343 PageClickTracker* page_click_tracker = new PageClickTracker(render_view);
329 // Note that the order of insertion of the listeners is important. 344 // Note that the order of insertion of the listeners is important.
330 // The password_autocomplete_manager takes the first shot at processing the 345 // The password_autocomplete_manager takes the first shot at processing the
331 // notification and can stop the propagation. 346 // notification and can stop the propagation.
332 page_click_tracker->AddListener(password_autofill_manager); 347 page_click_tracker->AddListener(password_autofill_manager);
333 page_click_tracker->AddListener(autofill_agent); 348 page_click_tracker->AddListener(autofill_agent);
334 349
335 new ChromeRenderViewObserver( 350 new ChromeRenderViewObserver(
336 render_view, content_settings, chrome_observer_.get(), 351 render_view, content_settings, chrome_observer_.get(),
337 extension_dispatcher_.get()); 352 extension_dispatcher_.get());
338 353
339 #if defined(ENABLE_PLUGINS) 354 #if defined(ENABLE_PLUGINS)
340 new PepperHelper(render_view); 355 new PepperHelper(render_view);
341 #endif 356 #endif
342 357
343 new NetErrorHelper(render_view); 358 new NetErrorHelper(render_view);
344 359
345 #if defined(ENABLE_AUTOMATION) 360 #if defined(ENABLE_AUTOMATION)
346 // Used only for testing/automation. 361 // Used only for testing/automation.
347 if (CommandLine::ForCurrentProcess()->HasSwitch( 362 if (command_line->HasSwitch(switches::kDomAutomationController))
348 switches::kDomAutomationController)) {
349 new AutomationRendererHelper(render_view); 363 new AutomationRendererHelper(render_view);
350 }
351 #endif 364 #endif
352 365
353 #if defined(ENABLE_ONE_CLICK_SIGNIN) 366 #if defined(ENABLE_ONE_CLICK_SIGNIN)
354 new OneClickSigninAgent(render_view); 367 new OneClickSigninAgent(render_view);
355 #endif 368 #endif
356 } 369 }
357 370
358 void ChromeContentRendererClient::SetNumberOfViews(int number_of_views) { 371 void ChromeContentRendererClient::SetNumberOfViews(int number_of_views) {
359 child_process_logging::SetNumberOfViews(number_of_views); 372 child_process_logging::SetNumberOfViews(number_of_views);
360 } 373 }
(...skipping 718 matching lines...) Expand 10 before | Expand all | Expand 10 after
1079 } 1092 }
1080 1093
1081 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories( 1094 void ChromeContentRendererClient::RegisterPPAPIInterfaceFactories(
1082 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) { 1095 webkit::ppapi::PpapiInterfaceFactoryManager* factory_manager) {
1083 #if defined(ENABLE_PLUGINS) 1096 #if defined(ENABLE_PLUGINS)
1084 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory); 1097 factory_manager->RegisterFactory(ChromePPAPIInterfaceFactory);
1085 #endif 1098 #endif
1086 } 1099 }
1087 1100
1088 } // namespace chrome 1101 } // namespace chrome
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698