chrome/browser/ui/views/toolbar_view.h - Issue 10857031: Move PrefMember and PrefChangeRegistrar to api directory.

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_view.h

Issue 10857031: Move PrefMember and PrefChangeRegistrar to api directory. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to parent Created 8 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

« no previous file with comments | « chrome/browser/ui/views/tabs/browser_tab_strip_controller.h ('k') | chrome/browser/ui/webui/extensions/extension_settings_handler.h » ('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) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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_VIEW_H_	5 #ifndef CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_

6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_	6 #define CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_

7	7

8 #include <set>	8 #include <set>

9 #include <string>	9 #include <string>

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 "chrome/browser/api/prefs/pref_member.h"

13 #include "chrome/browser/command_observer.h"	14 #include "chrome/browser/command_observer.h"

14 #include "chrome/browser/prefs/pref_member.h"

15 #include "chrome/browser/ui/search/search_model_observer.h"	15 #include "chrome/browser/ui/search/search_model_observer.h"

16 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"	16 #include "chrome/browser/ui/toolbar/back_forward_menu_model.h"

17 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"	17 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"

18 #include "chrome/browser/ui/views/reload_button.h"	18 #include "chrome/browser/ui/views/reload_button.h"

19 #include "ui/base/accelerators/accelerator.h"	19 #include "ui/base/accelerators/accelerator.h"

20 #include "ui/base/animation/slide_animation.h"	20 #include "ui/base/animation/slide_animation.h"

21 #include "ui/views/accessible_pane_view.h"	21 #include "ui/views/accessible_pane_view.h"

22 #include "ui/views/controls/button/menu_button.h"	22 #include "ui/views/controls/button/menu_button.h"

23 #include "ui/views/controls/button/menu_button_listener.h"	23 #include "ui/views/controls/button/menu_button_listener.h"

24 #include "ui/views/view.h"	24 #include "ui/views/view.h"

(...skipping 218 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
243	243

244 // A list of listeners to call when the menu opens.	244 // A list of listeners to call when the menu opens.

245 ObserverList<views::MenuListener> menu_listeners_;	245 ObserverList<views::MenuListener> menu_listeners_;

246	246

247 content::NotificationRegistrar registrar_;	247 content::NotificationRegistrar registrar_;

248	248

249 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);	249 DISALLOW_IMPLICIT_CONSTRUCTORS(ToolbarView);

250 };	250 };

251	251

252 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_	252 #endif // CHROME_BROWSER_UI_VIEWS_TOOLBAR_VIEW_H_

OLD	NEW