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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/base/cocoa/nib_loading.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
« ui/base/cocoa/menu_controller.mm ('K') | « ui/base/cocoa/menu_controller_unittest.mm ('k') | ui/base/cocoa/nsgraphics_context_additions_unittest.mm » ('j') | ui/message_center/cocoa/popup_controller.mm » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/cocoa/nib_loading.mm
diff --git a/ui/base/cocoa/nib_loading.mm b/ui/base/cocoa/nib_loading.mm
index 9430a76e85b2f6f00f2bbaf2731c18c5eb40f368..dd0eb48d806e1454028ada1c2b738b131d6b61ae 100644
--- a/ui/base/cocoa/nib_loading.mm
+++ b/ui/base/cocoa/nib_loading.mm
@@ -5,12 +5,12 @@
#import "ui/base/cocoa/nib_loading.h"
#include "base/mac/bundle_locations.h"
-#include "base/memory/scoped_nsobject.h"
+#include "base/mac/scoped_nsobject.h"
namespace ui {
NSView* GetViewFromNib(NSString* name) {
- scoped_nsobject<NSNib> nib(
+ base::scoped_nsobject<NSNib> nib(
[[NSNib alloc] initWithNibNamed:name
bundle:base::mac::FrameworkBundle()]);
if (!nib)
« ui/base/cocoa/menu_controller.mm ('K') | « ui/base/cocoa/menu_controller_unittest.mm ('k') | ui/base/cocoa/nsgraphics_context_additions_unittest.mm » ('j') | ui/message_center/cocoa/popup_controller.mm » ('J')

Powered by Google App Engine
This is Rietveld 408576698