chrome/browser/ui/cocoa/toolbar/toolbar_controller.h - Issue 17593006: mac: Update clients of scoped_nsobject.h.

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

Unified Diff: chrome/browser/ui/cocoa/toolbar/toolbar_controller.h

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 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 side-by-side diff with in-line comments

Download patch

« chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm ('K') | « chrome/browser/ui/cocoa/toolbar/toolbar_button_unittest.mm ('k') | chrome/browser/ui/cocoa/toolbar/toolbar_controller_unittest.mm » ('j') | content/browser/gamepad/gamepad_platform_data_fetcher_mac.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/toolbar/toolbar_controller.h

diff --git a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h

index 6fdbd585824ad276d1c273043d72dc1404110268..07a0bf5f159c9f5d58884847cdfd3d6b44e9e6b0 100644

--- a/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h

+++ b/chrome/browser/ui/cocoa/toolbar/toolbar_controller.h

@@ -7,7 +7,7 @@

#import <Cocoa/Cocoa.h>

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

+#include "base/mac/scoped_nsobject.h"

#include "base/memory/scoped_ptr.h"

#include "base/prefs/pref_member.h"

#import "chrome/browser/ui/cocoa/command_observer_bridge.h"

@@ -64,14 +64,15 @@ class NotificationBridge;

Browser* browser_; // weak, one per window

scoped_ptr<CommandObserverBridge> commandObserver_;

scoped_ptr<LocationBarViewMac> locationBarView_;

- scoped_nsobject<AutocompleteTextFieldEditor> autocompleteTextFieldEditor_;

+ base::scoped_nsobject<AutocompleteTextFieldEditor>

+ autocompleteTextFieldEditor_;

id<ViewResizer> resizeDelegate_; // weak

- scoped_nsobject<BackForwardMenuController> backMenuController_;

- scoped_nsobject<BackForwardMenuController> forwardMenuController_;

- scoped_nsobject<BrowserActionsController> browserActionsController_;

+ base::scoped_nsobject<BackForwardMenuController> backMenuController_;

+ base::scoped_nsobject<BackForwardMenuController> forwardMenuController_;

+ base::scoped_nsobject<BrowserActionsController> browserActionsController_;

// Lazily-instantiated menu controller.

- scoped_nsobject<WrenchMenuController> wrenchMenuController_;

+ base::scoped_nsobject<WrenchMenuController> wrenchMenuController_;

// Used for monitoring the optional toolbar button prefs.

scoped_ptr<ToolbarControllerInternal::NotificationBridge> notificationBridge_;

@@ -82,7 +83,7 @@ class NotificationBridge;

// We have an extra retain in the locationBar_.

// See comments in awakeFromNib for more info.

- scoped_nsobject<AutocompleteTextField> locationBarRetainer_;

+ base::scoped_nsobject<AutocompleteTextField> locationBarRetainer_;

// Tracking area for mouse enter/exit/moved in the toolbar.

ui::ScopedCrTrackingArea trackingArea_;