MacViews: Run native Cocoa context menus to support Services.

ui/views/controls/menu/menu_runner.h

 // 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.
 
 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_H_
 #define UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 16 matching lines @@
 namespace views {
 
 class MenuButton;
 class MenuItemView;
 class MenuModelAdapter;
 class MenuRunnerHandler;
 class Widget;
 
 namespace internal {
 class DisplayChangeListener;
-class MenuRunnerImpl;
+class MenuRunnerImplInterface;
 }
 
 namespace test {
 class MenuRunnerTestAPI;
 }
 
 // MenuRunner is responsible for showing (running) the menu and additionally
 // owning the MenuItemView. RunMenuAt() runs a nested message loop. It is safe
 // to delete MenuRunner at any point, but MenuRunner internally only deletes the
 // MenuItemView *after* the nested message loop completes. If MenuRunner is
@@ skipping 38 matching lines @@
 
   enum RunResult {
     // Indicates RunMenuAt is returning because the MenuRunner was deleted.
     MENU_DELETED,
 
     // Indicates RunMenuAt returned and MenuRunner was not deleted.
     NORMAL_EXIT
   };
 
   // Creates a new MenuRunner.
-  explicit MenuRunner(ui::MenuModel* menu_model);
-  explicit MenuRunner(MenuItemView* menu);
+  // |run_types| is a bitmask of RunTypes.
+  MenuRunner(ui::MenuModel* menu_model, int32 run_types);
+  MenuRunner(MenuItemView* menu, int32 run_types);
   ~MenuRunner();
 
   // Returns the menu.
   MenuItemView* GetMenu();
 
   // Takes ownership of |menu|, deleting it when MenuRunner is deleted. You
   // only need call this if you create additional menus from
   // MenuDelegate::GetSiblingMenu.
   void OwnMenu(MenuItemView* menu);
 
-  // Runs the menu. |types| is a bitmask of RunTypes. If this returns
-  // MENU_DELETED the method is returning because the MenuRunner was deleted.
+  // Runs the menu. If this returns MENU_DELETED the method is returning
+  // because the MenuRunner was deleted.
   // Typically callers should NOT do any processing if this returns
   // MENU_DELETED.
   // If |anchor| uses a |BUBBLE_..| type, the bounds will get determined by
   // using |bounds| as the thing to point at in screen coordinates.
   RunResult RunMenuAt(Widget* parent,
                       MenuButton* button,
                       const gfx::Rect& bounds,
                       MenuAnchorPosition anchor,
-                      ui::MenuSourceType source_type,
-                      int32 types) WARN_UNUSED_RESULT;
+                      ui::MenuSourceType source_type) WARN_UNUSED_RESULT;
 
   // Returns true if we're in a nested message loop running the menu.
   bool IsRunning() const;
 
   // Hides and cancels the menu. This does nothing if the menu is not open.
   void Cancel();
 
   // Returns the time from the event which closed the menu - or 0.
   base::TimeDelta closing_event_time() const;
 
  private:
   friend class test::MenuRunnerTestAPI;
 
   // Sets an implementation of RunMenuAt. This is intended to be used at test.
   void SetRunnerHandler(scoped_ptr<MenuRunnerHandler> runner_handler);
 
-  scoped_ptr<MenuModelAdapter> menu_model_adapter_;
+  const int32 run_types_;
 
-  internal::MenuRunnerImpl* holder_;
+  // We own this. No scoped_ptr because it is destroyed by calling Release().
+  internal::MenuRunnerImplInterface* holder_;

[sky, 2014/07/14 21:02:22]

holder_ was always a poor name. Maybe impl_?

[Andre, 2014/07/14 22:59:42]

Done.

 
   // An implementation of RunMenuAt. This is usually NULL and ignored. If this
   // is not NULL, this implementation will be used.
   scoped_ptr<MenuRunnerHandler> runner_handler_;
 
   scoped_ptr<internal::DisplayChangeListener> display_change_listener_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuRunner);
 };
 
 namespace internal {
 
 // DisplayChangeListener is intended to listen for changes in the display size
 // and cancel the menu. DisplayChangeListener is created when the menu is
 // shown.
 class DisplayChangeListener {
  public:
   virtual ~DisplayChangeListener() {}
 
   // Creates the platform specified DisplayChangeListener, or NULL if there
   // isn't one. Caller owns the returned value.
   static DisplayChangeListener* Create(Widget* parent,
                                        MenuRunner* runner);
 
  protected:
   DisplayChangeListener() {}
 };
 
-}
+}  // namespace internal
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_MENU_MENU_RUNNER_H_