summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/tab_contents
diff options
context:
space:
mode:
authorbinji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-02 02:40:50 +0000
committerbinji@chromium.org <binji@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-02 02:40:50 +0000
commit8deeab0ebb8a3f23b2318acba78529daef49b2ac (patch)
treee38fdc6360e6de14749bd18c2b5ae14da35e6211 /chrome/browser/ui/tab_contents
parent30676816756930d0b37da9caf9c4433a3dd51725 (diff)
downloadchromium_src-8deeab0ebb8a3f23b2318acba78529daef49b2ac.zip
chromium_src-8deeab0ebb8a3f23b2318acba78529daef49b2ac.tar.gz
chromium_src-8deeab0ebb8a3f23b2318acba78529daef49b2ac.tar.bz2
[Web Intents] Refactor picker to use WebIntentPickerModel.
Change the Web Intent picker to be vertical instead of horizontal, and add titles. Also removed WebIntentPickerControllerTest. Using WebIntentPickerModelTest instead. BUG=90458, 110417 TEST=WebIntentPickerModelTest.* Review URL: http://codereview.chromium.org/9148032 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120149 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/tab_contents')
-rw-r--r--chrome/browser/ui/tab_contents/tab_contents_wrapper.cc4
1 files changed, 1 insertions, 3 deletions
diff --git a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
index b7c5780..5a5a549 100644
--- a/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
+++ b/chrome/browser/ui/tab_contents/tab_contents_wrapper.cc
@@ -35,7 +35,6 @@
#include "chrome/browser/ui/bookmarks/bookmark_tab_helper.h"
#include "chrome/browser/ui/constrained_window_tab_helper.h"
#include "chrome/browser/ui/find_bar/find_tab_helper.h"
-#include "chrome/browser/ui/intents/web_intent_picker_factory_impl.h"
#include "chrome/browser/ui/intents/web_intent_picker_controller.h"
#include "chrome/browser/ui/pdf/pdf_tab_observer.h"
#include "chrome/browser/ui/prefs/prefs_tab_helper.h"
@@ -104,8 +103,7 @@ TabContentsWrapper::TabContentsWrapper(WebContents* contents)
synced_tab_delegate_.reset(new TabContentsWrapperSyncedTabDelegate(this));
content_settings_.reset(new TabSpecificContentSettings(contents));
translate_tab_helper_.reset(new TranslateTabHelper(contents));
- web_intent_picker_controller_.reset(new WebIntentPickerController(
- this, new WebIntentPickerFactoryImpl()));
+ web_intent_picker_controller_.reset(new WebIntentPickerController(this));
// Create the per-tab observers.
alternate_error_page_tab_observer_.reset(