Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(431)

Unified Diff: ui/views/controls/menu/menu_runner.h

Issue 331993009: MacViews: Run native Cocoa context menus to support Services. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase. Fixes for sky. Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ui/views/controls/menu/menu_runner.h
diff --git a/ui/views/controls/menu/menu_runner.h b/ui/views/controls/menu/menu_runner.h
index a96bfb2ee42f06738fde3b5536bf3b4282667f3a..663d1b04fb6225b6510ec9fa7fefeb13719ed7fd 100644
--- a/ui/views/controls/menu/menu_runner.h
+++ b/ui/views/controls/menu/menu_runner.h
@@ -34,7 +34,7 @@ class Widget;
namespace internal {
class DisplayChangeListener;
-class MenuRunnerImpl;
+class MenuRunnerImplInterface;
}
namespace test {
@@ -134,9 +134,9 @@ class VIEWS_EXPORT MenuRunner {
void SetRunnerHandler(scoped_ptr<MenuRunnerHandler> runner_handler);
const int32 run_types_;
- scoped_ptr<MenuModelAdapter> menu_model_adapter_;
- internal::MenuRunnerImpl* holder_;
+ // We own this. No scoped_ptr because it is destroyed by calling Release().
+ internal::MenuRunnerImplInterface* impl_;
// An implementation of RunMenuAt. This is usually NULL and ignored. If this
// is not NULL, this implementation will be used.

Powered by Google App Engine
This is Rietveld 408576698