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

Unified Diff: chrome/browser/ui/tab_contents/tab_contents.cc

Issue 10644002: Add core plumbing for Instant Extended work (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address pkasting, tfarina, and remaining nits. Created 8 years, 6 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
« no previous file with comments | « chrome/browser/ui/tab_contents/tab_contents.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/tab_contents/tab_contents.cc
diff --git a/chrome/browser/ui/tab_contents/tab_contents.cc b/chrome/browser/ui/tab_contents/tab_contents.cc
index ead2ad46594b860c44eb381fdecc5504f6ac1e35..d838195dc59c71182ac698808ea6332de0cd9f12 100644
--- a/chrome/browser/ui/tab_contents/tab_contents.cc
+++ b/chrome/browser/ui/tab_contents/tab_contents.cc
@@ -40,6 +40,8 @@
#include "chrome/browser/ui/pdf/pdf_tab_observer.h"
#include "chrome/browser/ui/prefs/prefs_tab_helper.h"
#include "chrome/browser/ui/sad_tab_helper.h"
+#include "chrome/browser/ui/search/search.h"
+#include "chrome/browser/ui/search/search_tab_helper.h"
#include "chrome/browser/ui/search_engines/search_engine_tab_helper.h"
#include "chrome/browser/ui/snapshot_tab_helper.h"
#include "chrome/browser/ui/sync/one_click_signin_helper.h"
@@ -117,6 +119,10 @@ TabContents::TabContents(WebContents* contents)
prerender_tab_helper_.reset(new prerender::PrerenderTabHelper(this));
restore_tab_helper_.reset(new RestoreTabHelper(contents));
search_engine_tab_helper_.reset(new SearchEngineTabHelper(contents));
+ bool is_search_enabled =
+ chrome::search::IsInstantExtendedAPIEnabled(profile());
+ search_tab_helper_.reset(
+ new chrome::search::SearchTabHelper(this, is_search_enabled));
snapshot_tab_helper_.reset(new SnapshotTabHelper(contents));
ssl_helper_.reset(new TabContentsSSLHelper(this));
synced_tab_delegate_.reset(new TabContentsSyncedTabDelegate(this));
« no previous file with comments | « chrome/browser/ui/tab_contents/tab_contents.h ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698