Merge Prevent nested Menu Cancelling

ui/views/controls/menu/menu_runner_impl.h

 // Copyright 2014 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.
 
 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_IMPL_H_
 #define UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_IMPL_H_
 
 #include <stdint.h>
 
 #include <set>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 #include "ui/views/controls/menu/menu_controller_delegate.h"
 #include "ui/views/controls/menu/menu_runner_impl_interface.h"
 #include "ui/views/views_export.h"
 
 namespace views {
 
 class MenuController;
 class MenuDelegate;
 class MenuItemView;
 
+namespace test {
+
+class MenuRunnerDestructionTest;
+
+}  // namespace test
+
 namespace internal {
 
 // A menu runner implementation that uses views::MenuItemView to show a menu.
 class VIEWS_EXPORT MenuRunnerImpl
     : NON_EXPORTED_BASE(public MenuRunnerImplInterface),
       NON_EXPORTED_BASE(public MenuControllerDelegate) {
  public:
   explicit MenuRunnerImpl(MenuItemView* menu);
 
   bool IsRunning() const override;
   void Release() override;
   MenuRunner::RunResult RunMenuAt(Widget* parent,
                                   MenuButton* button,
                                   const gfx::Rect& bounds,
                                   MenuAnchorPosition anchor,
                                   int32_t run_types) override;
   void Cancel() override;
   base::TimeTicks GetClosingEventTime() const override;
 
   // MenuControllerDelegate:
   void OnMenuClosed(NotifyType type,
                     MenuItemView* menu,
                     int mouse_event_flags) override;
   void SiblingMenuCreated(MenuItemView* menu) override;
 
  private:
+  friend class ::views::test::MenuRunnerDestructionTest;
+
   ~MenuRunnerImpl() override;
 
   // Cleans up after the menu is no longer showing. |result| is the menu that
   // the user selected, or NULL if nothing was selected.
   MenuRunner::RunResult MenuDone(NotifyType type,
                                  MenuItemView* result,
                                  int mouse_event_flags);
 
   // Returns true if mnemonics should be shown in the menu.
   bool ShouldShowMnemonics(MenuButton* button);
@@ skipping 35 matching lines @@
   // Used to detect deletion of |this| when notifying delegate of success.
   base::WeakPtrFactory<MenuRunnerImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuRunnerImpl);
 };
 
 }  // namespace internal
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_IMPL_H_