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

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

Issue 10696072: Fix web-intent-related unit_tests linking issues on Android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address Ben's comment Created 8 years, 5 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 | « no previous file | 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 0c75d739e06e8d5406ee7c2e8284ed821e29f85b..2c46a3d2d517caf3c02f6af2077cf6753e398fa9 100644
--- a/chrome/browser/ui/tab_contents/tab_contents.cc
+++ b/chrome/browser/ui/tab_contents/tab_contents.cc
@@ -124,10 +124,10 @@ TabContents::TabContents(WebContents* contents)
synced_tab_delegate_.reset(new TabContentsSyncedTabDelegate(this));
content_settings_.reset(new TabSpecificContentSettings(contents));
translate_tab_helper_.reset(new TranslateTabHelper(contents));
- web_intent_picker_controller_.reset(new WebIntentPickerController(this));
zoom_controller_.reset(new ZoomController(this));
#if !defined(OS_ANDROID)
+ web_intent_picker_controller_.reset(new WebIntentPickerController(this));
sad_tab_helper_.reset(new SadTabHelper(contents));
#endif
« no previous file with comments | « no previous file | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698