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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.mm

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: cleanups 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/ssl/ssl_add_cert_handler_mac.mm ('K') | « chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h ('k') | chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript_unittest.mm » ('j') | chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.mm
diff --git a/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.mm b/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.mm
index cb978bfa1294caebda960e9387fa1ba184c31ac5..a9ca820861699e78249c628b8798dfd5c959a594 100644
--- a/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.mm
+++ b/chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.mm
@@ -4,7 +4,7 @@
#import "chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript.h"
-#import "base/memory/scoped_nsobject.h"
+#import "base/mac/scoped_nsobject.h"
#import "base/strings/string16.h"
#include "base/strings/sys_string_conversions.h"
#include "chrome/browser/bookmarks/bookmark_model.h"
@@ -24,7 +24,7 @@
if (!node->is_folder())
continue;
- scoped_nsobject<BookmarkFolderAppleScript> bookmarkFolder(
+ base::scoped_nsobject<BookmarkFolderAppleScript> bookmarkFolder(
[[BookmarkFolderAppleScript alloc] initWithBookmarkNode:node]);
[bookmarkFolder setContainer:self
property:AppleScript::kBookmarkFoldersProperty];
@@ -95,7 +95,7 @@
if (!node->is_url())
continue;
- scoped_nsobject<BookmarkItemAppleScript> bookmarkItem(
+ base::scoped_nsobject<BookmarkItemAppleScript> bookmarkItem(
[[BookmarkItemAppleScript alloc] initWithBookmarkNode:node]);
[bookmarkItem setContainer:self
property:AppleScript::kBookmarkItemsProperty];
« chrome/browser/ssl/ssl_add_cert_handler_mac.mm ('K') | « chrome/browser/ui/cocoa/applescript/bookmark_applescript_utils_unittest.h ('k') | chrome/browser/ui/cocoa/applescript/bookmark_folder_applescript_unittest.mm » ('j') | chrome/browser/ui/cocoa/applescript/browsercrapplication+applescript_test.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698