| Index: chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
|
| diff --git a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
|
| index 9b5a08e074dcb6ec2e5b3a65c7867d5a98ac7b56..e0d91ad45e1fb510b3d47b542eb73527cdc7e33f 100644
|
| --- a/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
|
| +++ b/chrome/browser/ui/cocoa/apps/native_app_window_cocoa.h
|
| @@ -6,11 +6,12 @@
|
| #define CHROME_BROWSER_UI_COCOA_APPS_NATIVE_APP_WINDOW_COCOA_H_
|
|
|
| #import <Cocoa/Cocoa.h>
|
| +
|
| +#include <memory>
|
| #include <vector>
|
|
|
| #include "base/mac/scoped_nsobject.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "content/public/browser/web_contents_observer.h"
|
| #include "extensions/browser/app_window/app_window.h"
|
| #include "extensions/browser/app_window/native_app_window.h"
|
| @@ -128,7 +129,7 @@ class NativeAppWindowCocoa : public extensions::NativeAppWindow,
|
| bool IsFullscreenOrPending() const override;
|
| void UpdateWindowIcon() override;
|
| void UpdateWindowTitle() override;
|
| - void UpdateShape(scoped_ptr<SkRegion> region) override;
|
| + void UpdateShape(std::unique_ptr<SkRegion> region) override;
|
| void UpdateDraggableRegions(
|
| const std::vector<extensions::DraggableRegion>& regions) override;
|
| SkRegion* GetDraggableRegion() override;
|
| @@ -214,7 +215,8 @@ class NativeAppWindowCocoa : public extensions::NativeAppWindow,
|
|
|
| // The Extension Command Registry used to determine which keyboard events to
|
| // handle.
|
| - scoped_ptr<ExtensionKeybindingRegistryCocoa> extension_keybinding_registry_;
|
| + std::unique_ptr<ExtensionKeybindingRegistryCocoa>
|
| + extension_keybinding_registry_;
|
|
|
| // Tracks the last time the extension asked the window to activate.
|
| base::Time last_activate_;
|
|
|