Reverts debugging code added for 90860. The change to MenuItemView

seems to have fixed the bug. I'm not quite sure why, but I'll track it
down separately. For now I'm going to revert the patch you last
reviewed, then land the change the fixes the bug separately so that it
can merge over cleanly.

I'm TBRing since this is just a revert.

BUG=90860
TEST=none
R=ben@chromium.org
TBR=ben@chromium.org

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

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

4 files changed, 2 insertions, 17 deletions

diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc
index 1a3d7bd..c44aa9a 100644
--- a/views/controls/menu/menu_controller.cc
+++ b/views/controls/menu/menu_controller.cc
@@ -267,8 +267,7 @@ MenuItemView* MenuController::Run(Widget* parent,
   possible_drag_ = false;
   drag_in_progress_ = false;
 
-  // TODO(sky): remove volatile. Used in tracking 90860.
-  volatile bool nested_menu = showing_;
+  bool nested_menu = showing_;
   if (showing_) {
     // Only support nesting of blocking_run menus, nesting of
     // blocking/non-blocking shouldn't be needed.
diff --git a/views/controls/menu/menu_item_view.cc b/views/controls/menu/menu_item_view.cc
index 89fbfe6..bfe1b75 100644
--- a/views/controls/menu/menu_item_view.cc
+++ b/views/controls/menu/menu_item_view.cc
@@ -130,14 +130,6 @@ bool MenuItemView::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {
     return false;
   }
 
-  volatile MenuItemView* root_menu_item = GetRootMenuItem();
-  if (root_menu_item->canceled_) {
-    // TODO(sky): if |canceled_| is true, controller->exit_type() should be
-    // something other than EXIT_NONE, but crash reports seem to indicate
-    // otherwise. Used in tracking 90860.
-    return false;
-  }
-
   CHECK(GetDelegate());
   gfx::Point location(p);
   ConvertPointToScreen(this, &location);
@@ -216,8 +208,7 @@ void MenuItemView::RunMenuAt(Widget* parent,
     controller->Cancel(MenuController::EXIT_ALL);
     controller = NULL;
   }
-  // TODO(sky): remove volatile, used in tracking 90860.
-  volatile bool owns_controller = false;
+  bool owns_controller = false;
   if (!controller) {
     // No menus are showing, show one.
     controller = new MenuController(true);
diff --git a/views/widget/aero_tooltip_manager.cc b/views/widget/aero_tooltip_manager.cc
index e522e64..bd30e2d 100644
--- a/views/widget/aero_tooltip_manager.cc
+++ b/views/widget/aero_tooltip_manager.cc
@@ -12,7 +12,6 @@
 #include "ui/base/l10n/l10n_util_win.h"
 #include "ui/base/win/hwnd_util.h"
 #include "ui/gfx/point.h"
-#include "views/widget/widget.h"
 
 namespace views {
 
@@ -81,8 +80,6 @@ void AeroTooltipManager::OnTimer() {
 
   // Set the position and visibility.
   if (!tooltip_showing_) {
-    // TODO(sky): remove widget_visible, used in tracking 90860.
-    volatile bool widget_visibile = widget()->IsVisible();
     ::SendMessage(tooltip_hwnd_, TTM_POPUP, 0, 0);
     ::SendMessage(tooltip_hwnd_, TTM_TRACKPOSITION, 0, MAKELPARAM(pt.x, pt.y));
     ::SendMessage(tooltip_hwnd_, TTM_TRACKACTIVATE, true, (LPARAM)&toolinfo_);
diff --git a/views/widget/tooltip_manager_win.h b/views/widget/tooltip_manager_win.h
index d486070..dd7741f 100644
--- a/views/widget/tooltip_manager_win.h
+++ b/views/widget/tooltip_manager_win.h
@@ -90,8 +90,6 @@ class TooltipManagerWin : public TooltipManager {
   // Updates the tooltip for the specified location.
   void UpdateTooltip(const gfx::Point& location);
 
-  const Widget* widget() const { return widget_; }
-
   // Tooltip control window.
   HWND tooltip_hwnd_;