Merge 144625 - Close any open menus on activation changes.

ui/views/widget/widget.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/widget/widget.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "ui/base/hit_test.h"
@@ skipping 906 matching lines @@
 
 bool Widget::IsInactiveRenderingDisabled() const {
   return disable_inactive_rendering_;
 }
 
 void Widget::EnableInactiveRendering() {
   SetInactiveRenderingDisabled(false);
 }
 
 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));
 }
 
 void Widget::OnNativeFocus(gfx::NativeView old_focused_view) {
   WidgetFocusManager::GetInstance()->OnWidgetFocusEvent(old_focused_view,
                                                         GetNativeView());
 }
 
 void Widget::OnNativeBlur(gfx::NativeView new_focused_view) {
@@ skipping 385 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // internal::NativeWidgetPrivate, NativeWidget implementation:
 
 internal::NativeWidgetPrivate* NativeWidgetPrivate::AsNativeWidgetPrivate() {
   return this;
 }
 
 }  // namespace internal
 }  // namespace views