| Index: views/controls/menu/native_menu_x.h
|
| diff --git a/views/controls/menu/native_menu_x.h b/views/controls/menu/native_menu_x.h
|
| index 2621fb35569bfda330562bf04cb1c54e5257d158..34ae8944e7c6042efd8c55eed1350325ac46940d 100644
|
| --- a/views/controls/menu/native_menu_x.h
|
| +++ b/views/controls/menu/native_menu_x.h
|
| @@ -1,4 +1,4 @@
|
| -// Copyright (c) 2010 The Chromium Authors. All rights reserved.
|
| +// Copyright (c) 2011 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.
|
|
|
| @@ -16,6 +16,8 @@ class MenuModel;
|
|
|
| namespace views {
|
|
|
| +class MenuRunner;
|
| +
|
| // A non-GTK implementation of MenuWrapper, used currently for touchui.
|
| class NativeMenuX : public MenuWrapper,
|
| public MenuDelegate {
|
| @@ -46,7 +48,8 @@ class NativeMenuX : public MenuWrapper,
|
|
|
| // The attached model and delegate. Does not assume ownership.
|
| ui::MenuModel* model_;
|
| - scoped_ptr<MenuItemView> root_;
|
| + MenuItemView* root_;
|
| + scoped_ptr<MenuRunner> menu_runner_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(NativeMenuX);
|
| };
|
|
|