| Index: ui/base/cocoa/fullscreen_window_manager.h
|
| diff --git a/ui/base/cocoa/fullscreen_window_manager.h b/ui/base/cocoa/fullscreen_window_manager.h
|
| index 3258dffd30e8ca554354ad6461faa19323795f0d..1b18912cf6f439196387144c92d048ff05dc9cfc 100644
|
| --- a/ui/base/cocoa/fullscreen_window_manager.h
|
| +++ b/ui/base/cocoa/fullscreen_window_manager.h
|
| @@ -8,7 +8,7 @@
|
| #import <Cocoa/Cocoa.h>
|
|
|
| #include "base/mac/mac_util.h"
|
| -#include "base/memory/scoped_nsobject.h"
|
| +#include "base/mac/scoped_nsobject.h"
|
| #include "ui/base/ui_export.h"
|
|
|
| // A utility class to manage the fullscreen mode for a given window. This class
|
| @@ -16,11 +16,11 @@
|
| UI_EXPORT
|
| @interface FullscreenWindowManager : NSObject {
|
| @private
|
| - scoped_nsobject<NSWindow> window_;
|
| + base::scoped_nsobject<NSWindow> window_;
|
| // Explicitly keep track of the screen we want to position the window in.
|
| // This is better than using -[NSWindow screen] because that might change if
|
| // the screen changes to a low resolution.
|
| - scoped_nsobject<NSScreen> desiredScreen_;
|
| + base::scoped_nsobject<NSScreen> desiredScreen_;
|
| base::mac::FullScreenMode fullscreenMode_;
|
| BOOL fullscreenActive_;
|
| }
|
|
|