chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h - Issue 10857031: Move PrefMember and PrefChangeRegistrar to api directory.

Side by Side Diff: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.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/cocoa/extensions/extension_action_context_menu.mm ('k') | chrome/browser/ui/cocoa/toolbar/toolbar_controller.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_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_	5 #ifndef CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_

6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_	6 #define CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_

7	7

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

9	9

10 #import <Cocoa/Cocoa.h>	10 #import <Cocoa/Cocoa.h>

11	11

12 #include "base/memory/scoped_nsobject.h"	12 #include "base/memory/scoped_nsobject.h"

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

14 #include "base/memory/scoped_vector.h"	14 #include "base/memory/scoped_vector.h"

15 #include "base/memory/weak_ptr.h"	15 #include "base/memory/weak_ptr.h"

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

16 #include "chrome/browser/command_observer.h"	17 #include "chrome/browser/command_observer.h"

17 #include "chrome/browser/extensions/image_loading_tracker.h"	18 #include "chrome/browser/extensions/image_loading_tracker.h"

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

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

20 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"	20 #include "chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.h"

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

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

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

24 #include "chrome/common/content_settings_types.h"	24 #include "chrome/common/content_settings_types.h"

25	25

26 @class AutocompleteTextField;	26 @class AutocompleteTextField;

27 class ChromeToMobileDecoration;	27 class ChromeToMobileDecoration;

28 class CommandUpdater;	28 class CommandUpdater;

(...skipping 227 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
256 // Used to schedule a task for the first run info bubble.	256 // Used to schedule a task for the first run info bubble.

257 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_;	257 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_;

258	258

259 // Used to change the visibility of the star decoration.	259 // Used to change the visibility of the star decoration.

260 BooleanPrefMember edit_bookmarks_enabled_;	260 BooleanPrefMember edit_bookmarks_enabled_;

261	261

262 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);	262 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);

263 };	263 };

264	264

265 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_	265 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_

OLD	NEW