chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.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/content_settings/collected_cookies_mac.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/constrained_window/constrained_window_sheet_info.h ('k') | chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.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/content_settings/collected_cookies_mac.h

diff --git a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h

index 2d0c06b3173447568324f4df36171aaceaa0cc93..71d193f6f193d2b63df0c7182b7bb7d8172bf19a 100644

--- a/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h

+++ b/chrome/browser/ui/cocoa/content_settings/collected_cookies_mac.h

@@ -4,7 +4,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/browsing_data/cookies_tree_model.h"

#include "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"

@@ -48,7 +48,7 @@ class CollectedCookiesMac : public ConstrainedWindowMacDelegate,

scoped_ptr<ConstrainedWindowMac> window_;

- scoped_nsobject<CollectedCookiesWindowController> sheet_controller_;

+ base::scoped_nsobject<CollectedCookiesWindowController> sheet_controller_;

DISALLOW_COPY_AND_ASSIGN(CollectedCookiesMac);

};

@@ -68,11 +68,11 @@ class CollectedCookiesMac : public ConstrainedWindowMacDelegate,

scoped_ptr<CookiesTreeModel> blockedTreeModel_;

// Cached array of icons.

- scoped_nsobject<NSMutableArray> icons_;

+ base::scoped_nsobject<NSMutableArray> icons_;

// Our Cocoa copy of the model.

- scoped_nsobject<CocoaCookieTreeNode> cocoaAllowedTreeModel_;

- scoped_nsobject<CocoaCookieTreeNode> cocoaBlockedTreeModel_;

+ base::scoped_nsobject<CocoaCookieTreeNode> cocoaAllowedTreeModel_;

+ base::scoped_nsobject<CocoaCookieTreeNode> cocoaBlockedTreeModel_;

BOOL allowedCookiesButtonsEnabled_;

BOOL blockedCookiesButtonsEnabled_;

@@ -89,9 +89,9 @@ class CollectedCookiesMac : public ConstrainedWindowMacDelegate,

IBOutlet NSTextField* blockedCookiesText_;

IBOutlet NSView* cookieDetailsViewPlaceholder_;

- scoped_nsobject<NSViewAnimation> animation_;

+ base::scoped_nsobject<NSViewAnimation> animation_;

- scoped_nsobject<CookieDetailsViewController> detailsViewController_;

+ base::scoped_nsobject<CookieDetailsViewController> detailsViewController_;

content::WebContents* webContents_; // weak