chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm - 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/applescript/browsercrapplication+applescript.mm

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

« no previous file with comments | « chrome/browser/ui/cocoa/applescript/bookmark_node_applescript.mm ('k') | chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm » ('j') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm

diff --git a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm

index d6e33261bfb2d0a2d690fedf1c4b81ad1e7a7dcb..6cdd204ac6648efb576dec36ea0b3e0d1d3aff32 100644

--- a/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm

+++ b/chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.mm

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

#import "chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript.h"

#include "base/logging.h"

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

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

#import "chrome/browser/app_controller_mac.h"

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

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

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

if ((*browserIterator)->IsAttemptingToCloseBrowser())

continue;

- scoped_nsobject<WindowAppleScript> window(

+ base::scoped_nsobject<WindowAppleScript> window(

[[WindowAppleScript alloc] initWithBrowser:*browserIterator]);

[window setContainer:NSApp

property:AppleScript::kWindowsProperty];