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

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 to master 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
« no previous file with comments | « ui/views/cocoa/bridged_content_view.mm ('k') | ui/views/controls/menu/menu_runner.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f220cc45309e1e157f3c3dfb84081fa137cf74d5..3eb2cc1317aaec9c593e0e8e1144e8c4455bc8da 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 {
@@ -126,9 +126,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.
« no previous file with comments | « ui/views/cocoa/bridged_content_view.mm ('k') | ui/views/controls/menu/menu_runner.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698