| Index: chrome/browser/ui/views/dropdown_bar_host.h
|
| diff --git a/chrome/browser/ui/views/dropdown_bar_host.h b/chrome/browser/ui/views/dropdown_bar_host.h
|
| index 0693a78816b8803ed3b9dd317ebb0185bdf31412..a020764c7f780f5a135341b7817a71518b1588eb 100644
|
| --- a/chrome/browser/ui/views/dropdown_bar_host.h
|
| +++ b/chrome/browser/ui/views/dropdown_bar_host.h
|
| @@ -5,9 +5,10 @@
|
| #ifndef CHROME_BROWSER_UI_VIEWS_DROPDOWN_BAR_HOST_H_
|
| #define CHROME_BROWSER_UI_VIEWS_DROPDOWN_BAR_HOST_H_
|
|
|
| +#include <memory>
|
| +
|
| #include "base/compiler_specific.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "content/public/browser/native_web_keyboard_event.h"
|
| #include "ui/gfx/animation/animation_delegate.h"
|
| #include "ui/gfx/geometry/rect.h"
|
| @@ -159,7 +160,7 @@ class DropdownBarHost : public ui::AcceleratorTarget,
|
| DropdownBarHostDelegate* delegate_;
|
|
|
| // The animation class to use when opening the Dropdown widget.
|
| - scoped_ptr<gfx::SlideAnimation> animation_;
|
| + std::unique_ptr<gfx::SlideAnimation> animation_;
|
|
|
| // The focus manager we register with to keep track of focus changes.
|
| views::FocusManager* focus_manager_;
|
| @@ -170,11 +171,11 @@ class DropdownBarHost : public ui::AcceleratorTarget,
|
| // Tracks and stores the last focused view which is not the DropdownBarView
|
| // or any of its children. Used to restore focus once the DropdownBarView is
|
| // closed.
|
| - scoped_ptr<views::ExternalFocusTracker> focus_tracker_;
|
| + std::unique_ptr<views::ExternalFocusTracker> focus_tracker_;
|
|
|
| // Host is the Widget implementation that is created and maintained by the
|
| // dropdown bar. It contains the DropdownBarView.
|
| - scoped_ptr<views::Widget> host_;
|
| + std::unique_ptr<views::Widget> host_;
|
|
|
| // A flag to manually manage visibility. GTK/X11 is asynchronous and
|
| // the state of the widget can be out of sync.
|
|
|