| Index: chrome/browser/ui/views/frame/browser_view_layout.h
|
| diff --git a/chrome/browser/ui/views/frame/browser_view_layout.h b/chrome/browser/ui/views/frame/browser_view_layout.h
|
| index 85280933a8330bbc0f5416642047e650dc74559e..2c593a1a63a18553af1d19cd00233967b9931a5f 100644
|
| --- a/chrome/browser/ui/views/frame/browser_view_layout.h
|
| +++ b/chrome/browser/ui/views/frame/browser_view_layout.h
|
| @@ -5,10 +5,11 @@
|
| #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_
|
| #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_LAYOUT_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/compiler_specific.h"
|
| #include "base/gtest_prod_util.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "ui/gfx/geometry/rect.h"
|
| #include "ui/views/layout/layout_manager.h"
|
|
|
| @@ -125,7 +126,7 @@ class BrowserViewLayout : public views::LayoutManager {
|
| bool InfobarVisible() const;
|
|
|
| // The delegate interface. May be a mock in tests.
|
| - scoped_ptr<BrowserViewLayoutDelegate> delegate_;
|
| + std::unique_ptr<BrowserViewLayoutDelegate> delegate_;
|
|
|
| // The browser from the owning BrowserView.
|
| Browser* browser_;
|
| @@ -154,7 +155,7 @@ class BrowserViewLayout : public views::LayoutManager {
|
| gfx::Rect vertical_layout_rect_;
|
|
|
| // The host for use in positioning the web contents modal dialog.
|
| - scoped_ptr<WebContentsModalDialogHostViews> dialog_host_;
|
| + std::unique_ptr<WebContentsModalDialogHostViews> dialog_host_;
|
|
|
| // The latest dialog bounds applied during a layout pass.
|
| gfx::Rect latest_dialog_bounds_;
|
|
|