chrome/browser/ui/views/toolbar/wrench_menu.h - Issue 284893003: Move bookmarks/core/... to bookmarks/...

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/toolbar/wrench_menu.h

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixing errors reported by presubmit Created 6 years, 7 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/ui/views/toolbar/toolbar_view_browsertest.cc ('k') | chrome/browser/ui/views/toolbar/wrench_menu.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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_TOOLBAR_WRENCH_MENU_H_	5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_MENU_H_

6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_MENU_H_	6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_MENU_H_

7	7

8 #include <map>	8 #include <map>

9 #include <utility>	9 #include <utility>

10	10

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

12 #include "base/observer_list.h"	12 #include "base/observer_list.h"

13 #include "components/bookmarks/core/browser/base_bookmark_model_observer.h"	13 #include "components/bookmarks/browser/base_bookmark_model_observer.h"

14 #include "content/public/browser/notification_observer.h"	14 #include "content/public/browser/notification_observer.h"

15 #include "content/public/browser/notification_registrar.h"	15 #include "content/public/browser/notification_registrar.h"

16 #include "ui/base/models/menu_model.h"	16 #include "ui/base/models/menu_model.h"

17 #include "ui/views/controls/menu/menu_delegate.h"	17 #include "ui/views/controls/menu/menu_delegate.h"

18	18

19 class BookmarkMenuDelegate;	19 class BookmarkMenuDelegate;

20 class Browser;	20 class Browser;

21 class WrenchMenuObserver;	21 class WrenchMenuObserver;

22	22

23 namespace ui {	23 namespace ui {

(...skipping 159 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
183 const bool use_new_menu_;	183 const bool use_new_menu_;

184	184

185 const bool supports_new_separators_;	185 const bool supports_new_separators_;

186	186

187 ObserverList<WrenchMenuObserver> observer_list_;	187 ObserverList<WrenchMenuObserver> observer_list_;

188	188

189 DISALLOW_COPY_AND_ASSIGN(WrenchMenu);	189 DISALLOW_COPY_AND_ASSIGN(WrenchMenu);

190 };	190 };

191	191

192 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_MENU_H_	192 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_WRENCH_MENU_H_

OLD	NEW