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

Unified Diff: chrome/renderer/render_thread.cc

Issue 3312017: Plumbs through window.chrome.setSuggestResult. (Closed)
Patch Set: more comments Created 10 years, 3 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 side-by-side diff with in-line comments
Download patch
Index: chrome/renderer/render_thread.cc
diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index 9aad4dc9a2f2cfd7f0fa9e24e3370b00e8ffb1ed..a76338d9196f169cb388663e38273a194656d993 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

Powered by Google App Engine
This is Rietveld 408576698