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. |