trunk/src/ui/views/controls/menu/menu_2.h - Issue 14320040: Revert 194356 "views: Finally get rid of the deprecated Menu2 API."

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: trunk/src/ui/views/controls/menu/menu_2.h

Issue 14320040: Revert 194356 "views: Finally get rid of the deprecated Menu2 API." (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 7 years, 8 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:

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_2_H_	5 #ifndef UI_VIEWS_CONTROLS_MENU_MENU_2_H_

6 #define UI_VIEWS_CONTROLS_MENU_MENU_2_H_	6 #define UI_VIEWS_CONTROLS_MENU_MENU_2_H_

7	7

8 #include "base/basictypes.h"	8 #include "base/basictypes.h"

9 #include "base/memory/scoped_ptr.h"	9 #include "base/memory/scoped_ptr.h"

10 #include "ui/gfx/native_widget_types.h"	10 #include "ui/gfx/native_widget_types.h"

(...skipping 76 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
87	87

88 // The object that actually implements the menu.	88 // The object that actually implements the menu.

89 scoped_ptr<MenuWrapper> wrapper_;	89 scoped_ptr<MenuWrapper> wrapper_;

90	90

91 DISALLOW_COPY_AND_ASSIGN(Menu2);	91 DISALLOW_COPY_AND_ASSIGN(Menu2);

92 };	92 };

93	93

94 } // namespace views	94 } // namespace views

95	95

96 #endif // UI_VIEWS_CONTROLS_MENU_MENU_2_H_	96 #endif // UI_VIEWS_CONTROLS_MENU_MENU_2_H_

OLD	NEW