Merge 144625 - Close any open menus on activation changes.

ui/views/widget/widget.cc

Index: ui/views/widget/widget.cc
===================================================================
--- ui/views/widget/widget.cc	(revision 146181)
+++ ui/views/widget/widget.cc	(working copy)
@@ -924,19 +924,9 @@
 }
 
 void Widget::OnNativeWidgetActivationChanged(bool active) {
-  if (!active) {
+  if (!active)
     SaveWindowPlacement();
 
-#if defined(OS_CHROMEOS)
-    // Close any open menus.
-    // TODO(flackr|oshima): We should be doing this on !OS_MACOSX as before but
-    // we will have to fix crbug.com/130799.
-    MenuController* menu_controller = MenuController::GetActiveInstance();
-    if (menu_controller)
-      menu_controller->OnWidgetActivationChanged();
-#endif  // defined(OS_CHROMEOS)
-  }
-
   FOR_EACH_OBSERVER(Observer, observers_,
                     OnWidgetActivationChanged(this, active));
 }