chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_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/bookmarks/bookmark_editor_base_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/bookmarks/bookmark_bar_folder_window.mm ('K') | « chrome/browser/ui/cocoa/bookmarks/bookmark_drag_drop_cocoa.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller_unittest.mm » ('j') | chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h

diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h

index e8107eaf77d1fdc8fe1a2f316ee78201fc320f43..1a60827d37dfd21aabffac123f0a10dc49317eb4 100644

--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_controller.h

+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_editor_base_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 "chrome/browser/bookmarks/bookmark_editor.h"

#include "chrome/browser/bookmarks/bookmark_expanded_state_tracker.h"

@@ -41,10 +41,10 @@ class BookmarkModel;

BOOL creatingNewFolders_; // True while in createNewFolders.

// An array of BookmarkFolderInfo where each item describes a folder in the

// BookmarkNode structure.

- scoped_nsobject<NSArray> folderTreeArray_;

+ base::scoped_nsobject<NSArray> folderTreeArray_;

// Bound to the table view giving a path to the current selections, of which

// there should only ever be one.

- scoped_nsobject<NSArray> tableSelectionPaths_;

+ base::scoped_nsobject<NSArray> tableSelectionPaths_;

// C++ bridge object that observes the BookmarkModel for me.

scoped_ptr<BookmarkEditorBaseControllerBridge> observer_;

}