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

Unified Diff: views/controls/menu/native_menu_x.h

Issue 7746012: Fixes the touch build from patch @ 98179 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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 | « no previous file | views/controls/menu/native_menu_x.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
};
« no previous file with comments | « no previous file | views/controls/menu/native_menu_x.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698