chrome/browser/ui/views/location_bar/location_bar_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/location_bar/location_bar_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/prefs/prefs_tab_helper.h ('k') | chrome/browser/ui/views/tabs/browser_tab_strip_controller.h » ('j') | no next file with comments »

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_LOCATION_BAR_LOCATION_BAR_VIEW_H_	5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_

6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_	6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_

7	7

8 #include <string>	8 #include <string>

9 #include <vector>	9 #include <vector>

10	10

11 #include "base/compiler_specific.h"	11 #include "base/compiler_specific.h"

	12 #include "chrome/browser/api/prefs/pref_member.h"

12 #include "chrome/browser/extensions/extension_context_menu_model.h"	13 #include "chrome/browser/extensions/extension_context_menu_model.h"

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

14 #include "chrome/browser/search_engines/template_url_service_observer.h"	14 #include "chrome/browser/search_engines/template_url_service_observer.h"

15 #include "chrome/browser/ui/omnibox/location_bar.h"	15 #include "chrome/browser/ui/omnibox/location_bar.h"

16 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"	16 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"

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

18 #include "chrome/browser/ui/toolbar/toolbar_model.h"	18 #include "chrome/browser/ui/toolbar/toolbar_model.h"

19 #include "chrome/browser/ui/views/dropdown_bar_host.h"	19 #include "chrome/browser/ui/views/dropdown_bar_host.h"

20 #include "chrome/browser/ui/views/dropdown_bar_host_delegate.h"	20 #include "chrome/browser/ui/views/dropdown_bar_host_delegate.h"

21 #include "chrome/browser/ui/views/extensions/extension_popup.h"	21 #include "chrome/browser/ui/views/extensions/extension_popup.h"

22 #include "chrome/browser/ui/zoom/zoom_controller.h"	22 #include "chrome/browser/ui/zoom/zoom_controller.h"

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

(...skipping 539 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
563	563

564 #if defined(USE_AURA)	564 #if defined(USE_AURA)

565 // Observer for a fade-in animation.	565 // Observer for a fade-in animation.

566 scoped_ptr<FadeAnimationObserver> fade_animation_observer_;	566 scoped_ptr<FadeAnimationObserver> fade_animation_observer_;

567 #endif	567 #endif

568	568

569 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);	569 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView);

570 };	570 };

571	571

572 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_	572 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_

OLD	NEW