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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/ui/cocoa/custom_frame_view_unittest.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
« chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm ('K') | « chrome/browser/ui/cocoa/content_settings/cookie_tree_node.mm ('k') | chrome/browser/ui/cocoa/dev_tools_controller.h » ('j') | chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/custom_frame_view_unittest.mm
diff --git a/chrome/browser/ui/cocoa/custom_frame_view_unittest.mm b/chrome/browser/ui/cocoa/custom_frame_view_unittest.mm
index ee4a5f83d6b6ba7c30d986890afbfb25658d7422..4f061cdd019a7aab30444a74883eaead17f991f1 100644
--- a/chrome/browser/ui/cocoa/custom_frame_view_unittest.mm
+++ b/chrome/browser/ui/cocoa/custom_frame_view_unittest.mm
@@ -6,7 +6,7 @@
#include <objc/runtime.h>
#include "base/mac/mac_util.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
#import "chrome/browser/ui/cocoa/custom_frame_view.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
@@ -24,7 +24,7 @@ class CustomFrameViewTest : public PlatformTest {
view_.reset([[customFrameClass alloc] initWithFrame:frame]);
}
- scoped_nsobject<NSView> view_;
+ base::scoped_nsobject<NSView> view_;
};
// Test to make sure our class modifications were successful.
« chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_window.mm ('K') | « chrome/browser/ui/cocoa/content_settings/cookie_tree_node.mm ('k') | chrome/browser/ui/cocoa/dev_tools_controller.h » ('j') | chrome/browser/ui/cocoa/location_bar/autocomplete_text_field_cell.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698