summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/browser.cc
diff options
context:
space:
mode:
authorpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-22 20:12:14 +0000
committerpkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-22 20:12:14 +0000
commita40be8bcb46f89a8e11616cd790495c2fdccc6e0 (patch)
tree070055c4df9a15d8ca8c0d4a4a735798ec4ef209 /chrome/browser/ui/browser.cc
parenteacf28e772602086ea1ff4580a8d97b92c66e3b4 (diff)
downloadchromium_src-a40be8bcb46f89a8e11616cd790495c2fdccc6e0.zip
chromium_src-a40be8bcb46f89a8e11616cd790495c2fdccc6e0.tar.gz
chromium_src-a40be8bcb46f89a8e11616cd790495c2fdccc6e0.tar.bz2
Instead of passing ToolbarModel*s around, have classes ask the Browser.
This makes it simpler to override the toolbar model for testing. This will be useful in a future change where the OmniboxEditModel starts reading from the toolbar model "under the hood" in UpdatePermanentText(). BUG=none TEST=none R=sky@chromium.org Review URL: https://codereview.chromium.org/23365004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219087 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/browser.cc')
-rw-r--r--chrome/browser/ui/browser.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index cf7613d..cbf706b 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -368,8 +368,7 @@ Browser::Browser(const CreateParams& params)
toolbar_model_.reset(new ToolbarModelImpl(toolbar_model_delegate_.get()));
search_model_.reset(new SearchModel());
- search_delegate_.reset(
- new SearchDelegate(search_model_.get(), toolbar_model_.get()));
+ search_delegate_.reset(new SearchDelegate(search_model_.get()));
registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
content::Source<Profile>(profile_->GetOriginalProfile()));