Index: ui/aura/root_window_host_mac.mm |
diff --git a/ui/aura/root_window_host_mac.mm b/ui/aura/root_window_host_mac.mm |
index 35b1fc07a663abbe5c11467a68868117ac5a0e31..28943a958f9a9f0ec070d30ff386b49fb8a98e51 100644 |
--- a/ui/aura/root_window_host_mac.mm |
+++ b/ui/aura/root_window_host_mac.mm |
@@ -8,7 +8,7 @@ |
#include "base/compiler_specific.h" |
#include "base/mac/bundle_locations.h" |
-#include "base/memory/scoped_nsobject.h" |
+#include "base/mac/scoped_nsobject.h" |
#include "ui/aura/event.h" |
#include "ui/aura/root_window.h" |
#include "ui/aura/root_window_host.h" |
@@ -67,7 +67,7 @@ class RootWindowHostMac : public RootWindowHost, |
// An NSWindowController for the root window. Controls the actual Cocoa |
// window on Mac. |
- scoped_nsobject<NSWindowController> controller_; |
+ base::scoped_nsobject<NSWindowController> controller_; |
DISALLOW_COPY_AND_ASSIGN(RootWindowHostMac); |
}; |