Put sidetab menu back to wrench menu (confirmed with sky)

Removed OpenTanMode (confirmed with cole)
Removed ToolbarView::SetAppMenuModel

BUG=49229
TEST=none.

Review URL: http://codereview.chromium.org/2832058

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52968 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 12 deletions

diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index 30bd21f..cb90cf9 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -192,12 +192,11 @@ void ToolbarView::Init(Profile* profile) {
   show_home_button_.Init(prefs::kShowHomeButton, profile->GetPrefs(), this);
 
   SetProfile(profile);
-  if (!app_menu_model_.get()) {
-    if (WrenchMenuModel::IsEnabled()) {
-      SetAppMenuModel(new WrenchMenuModel(this, browser_));
-    } else {
-      SetAppMenuModel(new AppMenuModel(this, browser_));
-    }
+  if (WrenchMenuModel::IsEnabled()) {
+    app_menu_model_.reset(new WrenchMenuModel(this, browser_));
+  } else {
+    app_menu_model_.reset(new AppMenuModel(this, browser_));
+    app_menu_menu_.reset(new views::Menu2(app_menu_model_.get()));
   }
 }
 
@@ -216,12 +215,6 @@ void ToolbarView::Update(TabContents* tab, bool should_restore_state) {
     browser_actions_->RefreshBrowserActionViews();
 }
 
-void ToolbarView::SetAppMenuModel(menus::SimpleMenuModel* model) {
-  app_menu_model_.reset(model);
-  if (!WrenchMenuModel::IsEnabled())
-    app_menu_menu_.reset(new views::Menu2(app_menu_model_.get()));
-}
-
 void ToolbarView::SetToolbarFocusAndFocusLocationBar(int view_storage_id) {
   SetToolbarFocus(view_storage_id, location_bar_);
 }