chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h - Issue 17627005: mac: Remove unused includes of scoped_nsobject.h.

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/cocoa/location_bar/location_bar_view_mac.h

Issue 17627005: mac: Remove unused includes of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: builds Created 7 years, 5 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/info_bubble_view.mm ('k') | chrome/browser/ui/cocoa/menu_button.mm » ('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_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/mac/scoped_nsobject.h"

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

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

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

16 #include "base/prefs/pref_member.h"	15 #include "base/prefs/pref_member.h"

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

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

19 #include "chrome/browser/ui/omnibox/location_bar.h"	18 #include "chrome/browser/ui/omnibox/location_bar.h"

20 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"	19 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"

21 #include "chrome/browser/ui/toolbar/toolbar_model.h"	20 #include "chrome/browser/ui/toolbar/toolbar_model.h"

22 #include "chrome/common/content_settings_types.h"	21 #include "chrome/common/content_settings_types.h"

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

278 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_;	277 base::WeakPtrFactory<LocationBarViewMac> weak_ptr_factory_;

279	278

280 // Used to change the visibility of the star decoration.	279 // Used to change the visibility of the star decoration.

281 BooleanPrefMember edit_bookmarks_enabled_;	280 BooleanPrefMember edit_bookmarks_enabled_;

282	281

283 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);	282 DISALLOW_COPY_AND_ASSIGN(LocationBarViewMac);

284 };	283 };

285	284

286 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_	285 #endif // CHROME_BROWSER_UI_COCOA_LOCATION_BAR_LOCATION_BAR_VIEW_MAC_H_

OLD	NEW