summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/render_thread.cc
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-10 22:36:26 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-09-10 22:36:26 +0000
commit15d9c0c8432dc9b0bd700ebfdb5542534e7b2e00 (patch)
tree5fbd5eb8932485758f17be2060bd2d3179fed704 /chrome/renderer/render_thread.cc
parentb665bf2b7418b0820a677d11d50da12b5b800351 (diff)
downloadchromium_src-15d9c0c8432dc9b0bd700ebfdb5542534e7b2e00.zip
chromium_src-15d9c0c8432dc9b0bd700ebfdb5542534e7b2e00.tar.gz
chromium_src-15d9c0c8432dc9b0bd700ebfdb5542534e7b2e00.tar.bz2
Plumbs through window.chrome.setSuggestResult. It's currently hidden behind a flag.
BUG=none TEST=none Review URL: http://codereview.chromium.org/3312017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@59165 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/render_thread.cc')
-rw-r--r--chrome/renderer/render_thread.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index edbe0c9..a067435 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -65,6 +65,7 @@
#include "chrome/renderer/renderer_histogram_snapshots.h"
#include "chrome/renderer/renderer_webidbfactory_impl.h"
#include "chrome/renderer/renderer_webkitclient_impl.h"
+#include "chrome/renderer/search_extension.h"
#include "chrome/renderer/spellchecker/spellcheck.h"
#include "chrome/renderer/user_script_slave.h"
#include "ipc/ipc_channel_handle.h"
@@ -855,6 +856,10 @@ void RenderThread::EnsureWebKitInitialized() {
extensions_v8::ChromeAppExtension::Get());
WebScriptController::registerExtension(
extensions_v8::ExternalExtension::Get());
+ v8::Extension* search_extension = extensions_v8::SearchExtension::Get();
+ // search_extension is null if not enabled.
+ if (search_extension)
+ WebScriptController::registerExtension(search_extension);
// TODO(rafaelw). Note that extension-related v8 extensions are being
// bound currently based on is_extension_process_. This means that