Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2763)

Unified Diff: chrome/browser/ui/cocoa/applescript/window_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
Index: chrome/browser/ui/cocoa/applescript/window_applescript.mm
diff --git a/chrome/browser/ui/cocoa/applescript/window_applescript.mm b/chrome/browser/ui/cocoa/applescript/window_applescript.mm
index fe6677fe26e8f609188e71230db0657d09ef2cc0..f407d0fe939cacdbe820f180359eabdd924a865d 100644
--- a/chrome/browser/ui/cocoa/applescript/window_applescript.mm
+++ b/chrome/browser/ui/cocoa/applescript/window_applescript.mm
@@ -5,7 +5,7 @@
#import "chrome/browser/ui/cocoa/applescript/window_applescript.h"
#include "base/logging.h"
-#import "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
#include "base/memory/scoped_ptr.h"
#include "base/time.h"
#import "chrome/browser/app_controller_mac.h"
@@ -75,7 +75,7 @@
Browser::CreateParams(aProfile, chrome::HOST_DESKTOP_TYPE_NATIVE));
chrome::NewTab(browser_);
browser_->window()->Show();
- scoped_nsobject<NSNumber> numID(
+ base::scoped_nsobject<NSNumber> numID(
[[NSNumber alloc] initWithInt:browser_->session_id().id()]);
[self setUniqueID:numID];
}
@@ -93,7 +93,7 @@
// the applescript runtime calls appleScriptWindows in
// BrowserCrApplication and this particular window is never returned.
browser_ = aBrowser;
- scoped_nsobject<NSNumber> numID(
+ base::scoped_nsobject<NSNumber> numID(
[[NSNumber alloc] initWithInt:browser_->session_id().id()]);
[self setUniqueID:numID];
}
@@ -159,7 +159,7 @@
continue;
}
- scoped_nsobject<TabAppleScript> tab(
+ base::scoped_nsobject<TabAppleScript> tab(
[[TabAppleScript alloc] initWithWebContents:webContents]);
[tab setContainer:self
property:AppleScript::kTabsProperty];

Powered by Google App Engine
This is Rietveld 408576698