| Index: chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm
|
| diff --git a/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm b/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm
|
| index 51d4c5b7fac9c255b8d9fb5b25868d87856dc1bf..5d54f769580b75753fa0ce2caa7e2173f5122c40 100644
|
| --- a/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm
|
| +++ b/chrome/browser/ui/cocoa/tab_contents/tab_contents_controller.mm
|
| @@ -6,7 +6,7 @@
|
|
|
| #include <utility>
|
|
|
| -#include "base/memory/scoped_nsobject.h"
|
| +#include "base/mac/scoped_nsobject.h"
|
| #include "chrome/browser/devtools/devtools_window.h"
|
| #include "content/public/browser/render_view_host.h"
|
| #include "content/public/browser/render_widget_host_view.h"
|
| @@ -32,7 +32,7 @@ using content::WebContents;
|
| }
|
|
|
| - (void)loadView {
|
| - scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:NSZeroRect]);
|
| + base::scoped_nsobject<NSView> view([[NSView alloc] initWithFrame:NSZeroRect]);
|
| [view setAutoresizingMask:NSViewHeightSizable|NSViewWidthSizable];
|
| [self setView:view];
|
| }
|
|
|