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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 11040055: Adds a FakeToolbarModel for use in testing. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: remove unnecessary forward declaration Created 8 years, 2 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/chromeos/login/simple_web_view_dialog.cc ('k') | chrome/browser/ui/toolbar/fake_toolbar_model.h » ('j') | chrome/browser/ui/toolbar/fake_toolbar_model.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser.cc
diff --git a/chrome/browser/ui/browser.cc b/chrome/browser/ui/browser.cc
index 8a930a4bfaa2dd9fd9c4d71024ccc730113ec90e..771193249ce0183e73493478b3f5e5cb08520e36 100644
--- a/chrome/browser/ui/browser.cc
+++ b/chrome/browser/ui/browser.cc
@@ -135,6 +135,7 @@
#include "chrome/browser/ui/tabs/dock_info.h"
#include "chrome/browser/ui/tabs/tab_menu_model.h"
#include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/browser/ui/toolbar/toolbar_model_impl.h"
#include "chrome/browser/ui/unload_controller.h"
#include "chrome/browser/ui/web_applications/web_app_ui.h"
#include "chrome/browser/ui/webui/signin/login_ui_service.h"
@@ -364,7 +365,7 @@ Browser::Browser(const CreateParams& params)
chrome::RegisterAppPrefs(app_name_, profile_);
tab_strip_model_->AddObserver(this);
- toolbar_model_.reset(new ToolbarModel(toolbar_model_delegate_.get()));
+ toolbar_model_.reset(new ToolbarModelImpl(toolbar_model_delegate_.get()));
search_model_.reset(new chrome::search::SearchModel(NULL));
search_delegate_.reset(
new chrome::search::SearchDelegate(search_model_.get(),
« no previous file with comments | « chrome/browser/chromeos/login/simple_web_view_dialog.cc ('k') | chrome/browser/ui/toolbar/fake_toolbar_model.h » ('j') | chrome/browser/ui/toolbar/fake_toolbar_model.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698