chrome/browser/ui/cocoa/applescript/tab_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/tab_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/browsercrapplication+applescript_test.mm ('k') | chrome/browser/ui/cocoa/applescript/window_applescript.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/tab_applescript.mm

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

index 7fc426f15abec0cd4a9b201a559209abf20b6b1e..e2a3539553df713a4cfbf2d39df7f97b49dffda3 100644

--- a/chrome/browser/ui/cocoa/applescript/tab_applescript.mm

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

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

#include "base/bind.h"

#include "base/files/file_path.h"

#include "base/logging.h"

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

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

#include "base/strings/sys_string_conversions.h"

#include "chrome/browser/printing/print_view_manager.h"

#include "chrome/browser/sessions/session_id.h"

@@ -60,7 +60,7 @@ void ResumeAppleEventAndSendReply(NSAppleEventManagerSuspensionID suspension_id,

SessionID session;

SessionID::id_type futureSessionIDOfTab = session.id() + 1;

// Holds the SessionID that the new tab is going to get.

- scoped_nsobject<NSNumber> numID(

+ base::scoped_nsobject<NSNumber> numID(

[[NSNumber alloc] initWithInt:futureSessionIDOfTab]);

[self setUniqueID:numID];

}

@@ -85,7 +85,7 @@ void ResumeAppleEventAndSendReply(NSAppleEventManagerSuspensionID suspension_id,

webContents_ = webContents;

SessionTabHelper* session_tab_helper =

SessionTabHelper::FromWebContents(webContents);

- scoped_nsobject<NSNumber> numID(

+ base::scoped_nsobject<NSNumber> numID(

[[NSNumber alloc] initWithInt:session_tab_helper->session_id().id()]);

[self setUniqueID:numID];

}

@@ -100,7 +100,7 @@ void ResumeAppleEventAndSendReply(NSAppleEventManagerSuspensionID suspension_id,

webContents_ = webContents;

SessionTabHelper* session_tab_helper =

SessionTabHelper::FromWebContents(webContents);

- scoped_nsobject<NSNumber> numID(

+ base::scoped_nsobject<NSNumber> numID(

[[NSNumber alloc] initWithInt:session_tab_helper->session_id().id()]);

[self setUniqueID:numID];