Fixes regression from r68069. If the tab context menu was canceled we

would continue highlighting the tabs.

BUG=75456
TEST=see bug

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

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

1 files changed, 10 insertions, 5 deletions

diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
index 23ef917..6cda90a 100644
--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc
@@ -58,19 +58,19 @@ class BrowserTabStripController::TabContextMenuContents
   }
 
   // Overridden from ui::SimpleMenuModel::Delegate:
-  virtual bool IsCommandIdChecked(int command_id) const {
+  virtual bool IsCommandIdChecked(int command_id) const OVERRIDE {
     return controller_->IsCommandCheckedForTab(
         static_cast<TabStripModel::ContextMenuCommand>(command_id),
         tab_);
   }
-  virtual bool IsCommandIdEnabled(int command_id) const {
+  virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE {
     return controller_->IsCommandEnabledForTab(
         static_cast<TabStripModel::ContextMenuCommand>(command_id),
         tab_);
   }
   virtual bool GetAcceleratorForCommandId(
       int command_id,
-      ui::Accelerator* accelerator) {
+      ui::Accelerator* accelerator) OVERRIDE {
     int browser_cmd;
     return TabStripModel::ContextMenuCommandToBrowserCommand(command_id,
                                                              &browser_cmd) ?
@@ -78,12 +78,12 @@ class BrowserTabStripController::TabContextMenuContents
                                                             accelerator) :
         false;
   }
-  virtual void CommandIdHighlighted(int command_id) {
+  virtual void CommandIdHighlighted(int command_id) OVERRIDE {
     controller_->StopHighlightTabsForCommand(last_command_, tab_);
     last_command_ = static_cast<TabStripModel::ContextMenuCommand>(command_id);
     controller_->StartHighlightTabsForCommand(last_command_, tab_);
   }
-  virtual void ExecuteCommand(int command_id) {
+  virtual void ExecuteCommand(int command_id) OVERRIDE {
     // Executing the command destroys |this|, and can also end up destroying
     // |controller_| (e.g. for |CommandUseVerticalTabs|). So stop the highlights
     // before executing the command.
@@ -93,6 +93,11 @@ class BrowserTabStripController::TabContextMenuContents
         tab_);
   }
 
+  virtual void MenuClosed() OVERRIDE {
+    if (controller_)
+      controller_->tabstrip_->StopAllHighlighting();
+  }
+
  private:
   void Build() {
     menu_.reset(new views::Menu2(&model_));