| Index: chrome/browser/ui/views/frame/browser_view.h
|
| diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
|
| index 5b6541a0f7aa2498ed2839ca0bd71a99491e167c..1d4646f8a18404c9492e65ba33796cb9890a704d 100644
|
| --- a/chrome/browser/ui/views/frame/browser_view.h
|
| +++ b/chrome/browser/ui/views/frame/browser_view.h
|
| @@ -6,13 +6,13 @@
|
| #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
|
|
|
| #include <map>
|
| +#include <memory>
|
| #include <string>
|
| #include <vector>
|
|
|
| #include "base/compiler_specific.h"
|
| #include "base/gtest_prod_util.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_ptr.h"
|
| #include "base/timer/timer.h"
|
| #include "build/build_config.h"
|
| #include "chrome/browser/devtools/devtools_window.h"
|
| @@ -578,7 +578,7 @@ class BrowserView : public BrowserWindow,
|
| BrowserFrame* frame_;
|
|
|
| // The Browser object we are associated with.
|
| - scoped_ptr<Browser> browser_;
|
| + std::unique_ptr<Browser> browser_;
|
|
|
| // BrowserView layout (LTR one is pictured here).
|
| //
|
| @@ -623,7 +623,7 @@ class BrowserView : public BrowserWindow,
|
|
|
| // The Bookmark Bar View for this window. Lazily created. May be null for
|
| // non-tabbed browsers like popups. May not be visible.
|
| - scoped_ptr<BookmarkBarView> bookmark_bar_view_;
|
| + std::unique_ptr<BookmarkBarView> bookmark_bar_view_;
|
|
|
| // The do-nothing view which controls the z-order of the find bar widget
|
| // relative to views which paint into layers and views with an associated
|
| @@ -631,7 +631,7 @@ class BrowserView : public BrowserWindow,
|
| View* find_bar_host_view_;
|
|
|
| // The download shelf view (view at the bottom of the page).
|
| - scoped_ptr<DownloadShelfView> download_shelf_;
|
| + std::unique_ptr<DownloadShelfView> download_shelf_;
|
|
|
| // The InfoBarContainerView that contains InfoBars for the current tab.
|
| InfoBarContainerView* infobar_container_;
|
| @@ -649,10 +649,10 @@ class BrowserView : public BrowserWindow,
|
| // Tracks and stores the last focused view which is not the
|
| // devtools_web_view_ or any of its children. Used to restore focus once
|
| // the devtools_web_view_ is hidden.
|
| - scoped_ptr<views::ExternalFocusTracker> devtools_focus_tracker_;
|
| + std::unique_ptr<views::ExternalFocusTracker> devtools_focus_tracker_;
|
|
|
| // The Status information bubble that appears at the bottom of the window.
|
| - scoped_ptr<StatusBubbleViews> status_bubble_;
|
| + std::unique_ptr<StatusBubbleViews> status_bubble_;
|
|
|
| // A mapping between accelerators and commands.
|
| std::map<ui::Accelerator, int> accelerator_table_;
|
| @@ -669,11 +669,11 @@ class BrowserView : public BrowserWindow,
|
| // jankiness.
|
| bool in_process_fullscreen_;
|
|
|
| - scoped_ptr<ExclusiveAccessBubbleViews> exclusive_access_bubble_;
|
| + std::unique_ptr<ExclusiveAccessBubbleViews> exclusive_access_bubble_;
|
|
|
| #if defined(OS_WIN)
|
| // Helper class to listen for completion of first page load.
|
| - scoped_ptr<LoadCompleteListener> load_complete_listener_;
|
| + std::unique_ptr<LoadCompleteListener> load_complete_listener_;
|
|
|
| // The custom JumpList for Windows 7.
|
| scoped_refptr<JumpList> jumplist_;
|
| @@ -691,14 +691,15 @@ class BrowserView : public BrowserWindow,
|
| // location bar even if the browser window is not active.
|
| bool force_location_bar_focus_;
|
|
|
| - scoped_ptr<ImmersiveModeController> immersive_mode_controller_;
|
| + std::unique_ptr<ImmersiveModeController> immersive_mode_controller_;
|
|
|
| - scoped_ptr<WebContentsCloseHandler> web_contents_close_handler_;
|
| + std::unique_ptr<WebContentsCloseHandler> web_contents_close_handler_;
|
|
|
| SigninViewController signin_view_controller_;
|
|
|
| // The class that registers for keyboard shortcuts for extension commands.
|
| - scoped_ptr<ExtensionKeybindingRegistryViews> extension_keybinding_registry_;
|
| + std::unique_ptr<ExtensionKeybindingRegistryViews>
|
| + extension_keybinding_registry_;
|
|
|
| mutable base::WeakPtrFactory<BrowserView> activate_modal_dialog_factory_;
|
|
|
|
|