chrome/browser/views/toolbar_view.h - Issue 276010: Remove the implicit wrench menu items for browser actions.

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/views/toolbar_view.h

Issue 276010: Remove the implicit wrench menu items for browser actions. (Closed)

Patch Set: Rebase Created 11 years, 2 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

« no previous file with comments | « chrome/browser/views/browser_actions_container.cc ('k') | chrome/browser/views/toolbar_view.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2009 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_VIEWS_TOOLBAR_VIEW_H_	5 #ifndef CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_

6 #define CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_	6 #define CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_

7	7

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

9	9

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

(...skipping 229 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
240	240

241 // The display mode used when laying out the toolbar.	241 // The display mode used when laying out the toolbar.

242 DisplayMode display_mode_;	242 DisplayMode display_mode_;

243	243

244 // The contents of the various menus.	244 // The contents of the various menus.

245 scoped_ptr<views::SimpleMenuModel> page_menu_contents_;	245 scoped_ptr<views::SimpleMenuModel> page_menu_contents_;

246 scoped_ptr<ZoomMenuModel> zoom_menu_contents_;	246 scoped_ptr<ZoomMenuModel> zoom_menu_contents_;

247 scoped_ptr<EncodingMenuModel> encoding_menu_contents_;	247 scoped_ptr<EncodingMenuModel> encoding_menu_contents_;

248 scoped_ptr<views::SimpleMenuModel> devtools_menu_contents_;	248 scoped_ptr<views::SimpleMenuModel> devtools_menu_contents_;

249 scoped_ptr<views::SimpleMenuModel> app_menu_contents_;	249 scoped_ptr<views::SimpleMenuModel> app_menu_contents_;

250 scoped_ptr<views::SimpleMenuModel> extension_menu_contents_;

251	250

252 // TODO(beng): build these into MenuButton.	251 // TODO(beng): build these into MenuButton.

253 scoped_ptr<views::Menu2> page_menu_menu_;	252 scoped_ptr<views::Menu2> page_menu_menu_;

254 scoped_ptr<views::Menu2> app_menu_menu_;	253 scoped_ptr<views::Menu2> app_menu_menu_;

255 };	254 };

256	255

257 #endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_	256 #endif // CHROME_BROWSER_VIEWS_TOOLBAR_VIEW_H_

OLD	NEW