chrome/browser/ui/views/compact_nav/compact_options_bar.h - Issue 7720012: Moves ownership of MenuItemView to MenuRunner as well as responbility

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: chrome/browser/ui/views/compact_nav/compact_options_bar.h

Issue 7720012: Moves ownership of MenuItemView to MenuRunner as well as responbility (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix unit test 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 unified diff | Download patch | Annotate | Revision Log

« chrome/browser/chromeos/status/network_menu.cc ('K') | « chrome/browser/ui/views/browser_actions_container.cc ('k') | chrome/browser/ui/views/compact_nav/compact_options_bar.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 CHROME_BROWSER_UI_VIEWS_COMPACT_NAV_COMPACT_OPTIONS_BAR_H_	5 #ifndef CHROME_BROWSER_UI_VIEWS_COMPACT_NAV_COMPACT_OPTIONS_BAR_H_

6 #define CHROME_BROWSER_UI_VIEWS_COMPACT_NAV_COMPACT_OPTIONS_BAR_H_	6 #define CHROME_BROWSER_UI_VIEWS_COMPACT_NAV_COMPACT_OPTIONS_BAR_H_

7	7

8 #include <vector>	8 #include <vector>

9	9

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

(...skipping 52 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
63 // Load the images for the back and forward buttons.	63 // Load the images for the back and forward buttons.

64 void LoadImages();	64 void LoadImages();

65	65

66 BrowserView* browser_view_;	66 BrowserView* browser_view_;

67	67

68 bool initialized_;	68 bool initialized_;

69	69

70 // Button and models for the wrench/app menu.	70 // Button and models for the wrench/app menu.

71 views::MenuButton* app_menu_;	71 views::MenuButton* app_menu_;

72 scoped_ptr<ui::SimpleMenuModel> wrench_menu_model_;	72 scoped_ptr<ui::SimpleMenuModel> wrench_menu_model_;

73 scoped_refptr<WrenchMenu> wrench_menu_;	73 scoped_ptr<WrenchMenu> wrench_menu_;

74 std::vector<views::MenuListener*> menu_listeners_;	74 std::vector<views::MenuListener*> menu_listeners_;

75	75

76 // TODO(stevet): Add the BrowserActionsContainer.	76 // TODO(stevet): Add the BrowserActionsContainer.

77	77

78 DISALLOW_COPY_AND_ASSIGN(CompactOptionsBar);	78 DISALLOW_COPY_AND_ASSIGN(CompactOptionsBar);

79 };	79 };

80	80

81 #endif // CHROME_BROWSER_UI_VIEWS_COMPACT_NAV_COMPACT_OPTIONS_BAR_H_	81 #endif // CHROME_BROWSER_UI_VIEWS_COMPACT_NAV_COMPACT_OPTIONS_BAR_H_

OLD	NEW