Index: chrome/browser/ui/views/tabs/browser_tab_strip_controller.h |
diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h |
index f06435df7427bcc27ff1884b8ec6ac8a7e9f8dba..75f867a6240091f0c7fcc1862c8e3e70600471fc 100644 |
--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h |
+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.h |
@@ -5,9 +5,10 @@ |
#ifndef CHROME_BROWSER_UI_VIEWS_TABS_BROWSER_TAB_STRIP_CONTROLLER_H_ |
#define CHROME_BROWSER_UI_VIEWS_TABS_BROWSER_TAB_STRIP_CONTROLLER_H_ |
+#include <memory> |
+ |
#include "base/compiler_specific.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "chrome/browser/ui/tabs/hover_tab_selector.h" |
#include "chrome/browser/ui/tabs/tab_strip_model.h" |
#include "chrome/browser/ui/views/frame/immersive_mode_controller.h" |
@@ -149,7 +150,7 @@ class BrowserTabStripController : public TabStripController, |
Browser* browser_; |
// If non-NULL it means we're showing a menu for the tab. |
- scoped_ptr<TabContextMenuContents> context_menu_contents_; |
+ std::unique_ptr<TabContextMenuContents> context_menu_contents_; |
// Helper for performing tab selection as a result of dragging over a tab. |
HoverTabSelector hover_tab_selector_; |
@@ -157,7 +158,7 @@ class BrowserTabStripController : public TabStripController, |
// Forces the tabs to use the regular (non-immersive) style and the |
// top-of-window views to be revealed when the user is dragging |tabstrip|'s |
// tabs. |
- scoped_ptr<ImmersiveRevealedLock> immersive_reveal_lock_; |
+ std::unique_ptr<ImmersiveRevealedLock> immersive_reveal_lock_; |
PrefChangeRegistrar local_pref_registrar_; |