| Index: chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h
|
| diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h
|
| index a374dd2915ad29053cb509822623d80c12855251..7fc8ec93150c1389d1258246e725bc519d4cc60f 100644
|
| --- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h
|
| +++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h
|
| @@ -5,10 +5,11 @@
|
| #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
|
| #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "ash/shell_observer.h"
|
| #include "base/gtest_prod_util.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
|
| #include "chrome/browser/ui/views/tab_icon_view_model.h"
|
|
|
| @@ -133,10 +134,10 @@ class BrowserNonClientFrameViewAsh : public BrowserNonClientFrameView,
|
| TabIconView* window_icon_;
|
|
|
| // Helper class for painting the header.
|
| - scoped_ptr<ash::HeaderPainter> header_painter_;
|
| + std::unique_ptr<ash::HeaderPainter> header_painter_;
|
|
|
| // Updates the hittest bounds overrides based on the window show type.
|
| - scoped_ptr<ash::FrameBorderHitTestController>
|
| + std::unique_ptr<ash::FrameBorderHitTestController>
|
| frame_border_hit_test_controller_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh);
|
|
|