Index: chrome/app/chrome_main_app_mode_mac.mm |
diff --git a/chrome/app/chrome_main_app_mode_mac.mm b/chrome/app/chrome_main_app_mode_mac.mm |
index 0f0af852fd5216faa4766c6f8e62f50cdadede7a..149b4021c9e070e54403aef63fafa1a7bfdc499e 100644 |
--- a/chrome/app/chrome_main_app_mode_mac.mm |
+++ b/chrome/app/chrome_main_app_mode_mac.mm |
@@ -17,7 +17,7 @@ |
#include "base/mac/mac_logging.h" |
#include "base/mac/mac_util.h" |
#include "base/mac/scoped_nsautorelease_pool.h" |
-#include "base/memory/scoped_nsobject.h" |
+#include "base/mac/scoped_nsobject.h" |
#include "base/message_loop.h" |
#include "base/path_service.h" |
#include "base/strings/sys_string_conversions.h" |
@@ -81,7 +81,7 @@ class AppShimController : public IPC::Listener { |
void Close(); |
IPC::ChannelProxy* channel_; |
- scoped_nsobject<AppShimDelegate> nsapp_delegate_; |
+ base::scoped_nsobject<AppShimDelegate> nsapp_delegate_; |
DISALLOW_COPY_AND_ASSIGN(AppShimController); |
}; |