Instant: Use only one hidden WebContents per profile.

chrome/renderer/chrome_content_renderer_client.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/renderer/chrome_content_renderer_client.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 47 matching lines @@
 #include "chrome/renderer/playback_extension.h"
 #include "chrome/renderer/plugins/plugin_placeholder.h"
 #include "chrome/renderer/plugins/plugin_uma.h"
 #include "chrome/renderer/prerender/prerender_dispatcher.h"
 #include "chrome/renderer/prerender/prerender_helper.h"
 #include "chrome/renderer/prerender/prerender_webmediaplayer.h"
 #include "chrome/renderer/prerender/prerenderer_client.h"
 #include "chrome/renderer/printing/print_web_view_helper.h"
 #include "chrome/renderer/safe_browsing/malware_dom_details.h"
 #include "chrome/renderer/safe_browsing/phishing_classifier_delegate.h"
+#include "chrome/renderer/searchbox/embedded_searchbox.h"
+#include "chrome/renderer/searchbox/embedded_searchbox_extension.h"
 #include "chrome/renderer/searchbox/searchbox.h"
 #include "chrome/renderer/searchbox/searchbox_extension.h"
 #include "chrome/renderer/spellchecker/spellcheck.h"
 #include "chrome/renderer/spellchecker/spellcheck_provider.h"
 #include "components/visitedlink/renderer/visitedlink_slave.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/renderer/render_thread.h"
 #include "content/public/renderer/render_view.h"
 #include "content/public/renderer/render_view_visitor.h"
 #include "extensions/common/constants.h"
@@ skipping 136 matching lines @@
   thread->AddObserver(extension_dispatcher_.get());
 #if defined(FULL_SAFE_BROWSING)
   thread->AddObserver(phishing_classifier_.get());
 #endif
   thread->AddObserver(spellcheck_.get());
   thread->AddObserver(visited_link_slave_.get());
   thread->AddObserver(prerender_dispatcher_.get());
 
   thread->RegisterExtension(extensions_v8::ExternalExtension::Get());
   thread->RegisterExtension(extensions_v8::LoadTimesExtension::Get());
-  thread->RegisterExtension(extensions_v8::SearchBoxExtension::Get());
 
   CommandLine* command_line = CommandLine::ForCurrentProcess();
+
+  if (command_line->HasSwitch(switches::kInstantProcess)) {
+    if (command_line->HasSwitch(switches::kEnableInstantExtendedAPI)) {
+      thread->RegisterExtension(
+          extensions_v8::EmbeddedSearchBoxExtension::Get());
+    } else {
+      thread->RegisterExtension(extensions_v8::SearchBoxExtension::Get());
+    }
+  }
+
   if (command_line->HasSwitch(switches::kEnableBenchmarking))
     thread->RegisterExtension(extensions_v8::BenchmarkingExtension::Get());
   if (command_line->HasSwitch(switches::kEnableNetBenchmarking))
     thread->RegisterExtension(extensions_v8::NetBenchmarkingExtension::Get());
 
   if (command_line->HasSwitch(switches::kPlaybackMode) ||
       command_line->HasSwitch(switches::kRecordMode) ||
       command_line->HasSwitch(switches::kNoJsRandomness)) {
     thread->RegisterExtension(extensions_v8::PlaybackExtension::Get());
   }
@@ skipping 64 matching lines @@
       new ContentSettingsObserver(render_view);
   if (chrome_observer_.get()) {
     content_settings->SetContentSettingRules(
         chrome_observer_->content_setting_rules());
   }
   new extensions::ExtensionHelper(render_view, extension_dispatcher_.get());
   new PageLoadHistograms(render_view);
 #if defined(ENABLE_PRINTING)
   new printing::PrintWebViewHelper(render_view);
 #endif
-  new SearchBox(render_view);
+  CommandLine* command_line = CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(switches::kInstantProcess)) {
+    if (command_line->HasSwitch(switches::kEnableInstantExtendedAPI))
+      new EmbeddedSearchBox(render_view);
+    else
+      new SearchBox(render_view);
+  }
   new SpellCheckProvider(render_view, spellcheck_.get());
   new prerender::PrerendererClient(render_view);
 #if defined(FULL_SAFE_BROWSING)
   safe_browsing::MalwareDOMDetails::Create(render_view);
 #endif
 
   PasswordAutofillManager* password_autofill_manager =
       new PasswordAutofillManager(render_view);
   AutofillAgent* autofill_agent = new AutofillAgent(render_view,
                                                     password_autofill_manager);
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kEnablePasswordGeneration)) {
+  if (command_line->HasSwitch(switches::kEnablePasswordGeneration))
     new PasswordGenerationManager(render_view);
-  }
   PageClickTracker* page_click_tracker = new PageClickTracker(render_view);
   // Note that the order of insertion of the listeners is important.
   // The password_autocomplete_manager takes the first shot at processing the
   // notification and can stop the propagation.
   page_click_tracker->AddListener(password_autofill_manager);
   page_click_tracker->AddListener(autofill_agent);
 
   new ChromeRenderViewObserver(
       render_view, content_settings, chrome_observer_.get(),
       extension_dispatcher_.get());
 
 #if defined(ENABLE_PLUGINS)
   new PepperHelper(render_view);
 #endif
 
   new NetErrorHelper(render_view);
 
 #if defined(ENABLE_AUTOMATION)
   // Used only for testing/automation.
-  if (CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDomAutomationController)) {
+  if (command_line->HasSwitch(switches::kDomAutomationController))
     new AutomationRendererHelper(render_view);
-  }
 #endif
 
 #if defined(ENABLE_ONE_CLICK_SIGNIN)
   new OneClickSigninAgent(render_view);
 #endif
 }
 
 void ChromeContentRendererClient::SetNumberOfViews(int number_of_views) {
   child_process_logging::SetNumberOfViews(number_of_views);
 }
@@ skipping 755 matching lines @@
   if (container->element().shadowHost().tagName().equals(
           WebKit::WebString::fromUTF8(kWebViewTagName))) {
     return true;
   } else {
     return CommandLine::ForCurrentProcess()->HasSwitch(
         switches::kEnableBrowserPluginForAllViewTypes);
   }
 }
 
 }  // namespace chrome