Revert 50604 - Moves cut/copy/paste and increment/descrement/fullscreen into buttons

on views.

BUG=45734
TEST=none

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

TBR=sky@chromium.org
Review URL: http://codereview.chromium.org/2829021

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

1 files changed, 4 insertions, 25 deletions

diff --git a/chrome/browser/views/toolbar_view.cc b/chrome/browser/views/toolbar_view.cc
index 3175922..2cf5ca6 100644
--- a/chrome/browser/views/toolbar_view.cc
+++ b/chrome/browser/views/toolbar_view.cc
@@ -19,7 +19,6 @@
 #include "chrome/browser/views/browser_actions_container.h"
 #include "chrome/browser/views/event_utils.h"
 #include "chrome/browser/views/frame/browser_view.h"
-#include "chrome/browser/views/wrench_menu.h"
 #include "chrome/browser/wrench_menu_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_service.h"
@@ -182,10 +181,6 @@ void ToolbarView::Init(Profile* profile) {
     bookmark_menu_ = NULL;
   }
 
-  // Catch the case where the window is created after we detect a new version.
-  if (Singleton<UpgradeDetector>::get()->notify_upgrade())
-    ShowUpgradeReminder();
-
   LoadImages();
 
   // Always add children in order from left to right, for accessibility.
@@ -204,6 +199,10 @@ void ToolbarView::Init(Profile* profile) {
   location_bar_->Init();
   show_home_button_.Init(prefs::kShowHomeButton, profile->GetPrefs(), this);
 
+  // Catch the case where the window is created after we detect a new version.
+  if (Singleton<UpgradeDetector>::get()->notify_upgrade())
+    ShowUpgradeReminder();
+
   SetProfile(profile);
   if (!app_menu_model_.get()) {
     if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewWrenchMenu)) {
@@ -743,26 +742,6 @@ void ToolbarView::RunPageMenu(const gfx::Point& pt) {
 }
 
 void ToolbarView::RunAppMenu(const gfx::Point& pt) {
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewWrenchMenu)) {
-    bool destroyed_flag = false;
-    destroyed_flag_ = &destroyed_flag;
-    wrench_menu_.reset(new WrenchMenu(browser_));
-    wrench_menu_->Init(app_menu_model_.get());
-
-    for (size_t i = 0; i < menu_listeners_.size(); ++i)
-      menu_listeners_[i]->OnMenuOpened();
-
-    wrench_menu_->RunMenu(app_menu_);
-
-    if (destroyed_flag)
-      return;
-    destroyed_flag_ = NULL;
-
-    // Stop pulsating the upgrade reminder on the app menu, if active.
-    upgrade_reminder_pulse_timer_.Stop();
-    return;
-  }
-
   bool destroyed_flag = false;
   destroyed_flag_ = &destroyed_flag;