Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1360)

Unified Diff: chrome/browser/ui/views/frame/browser_view.cc

Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.h ('k') | chrome/browser/ui/views/frame/browser_view_layout.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/frame/browser_view.cc
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 4e63db81d8e2d4c141ae180b49dce82ea4f497cf..5621676301e8004077e4964139105d7246ed5b6d 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -5,7 +5,9 @@
#include "chrome/browser/ui/views/frame/browser_view.h"
#include <stdint.h>
+
#include <algorithm>
+#include <memory>
#include <utility>
#include "base/auto_reset.h"
@@ -13,7 +15,6 @@
#include "base/i18n/rtl.h"
#include "base/location.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/metrics/histogram.h"
#include "base/profiler/scoped_tracker.h"
#include "base/single_thread_task_runner.h"
@@ -1044,7 +1045,7 @@ void BrowserView::SetFocusToLocationBar(bool select_all) {
// that the location bar view is visible and is considered focusable. If the
// location bar view gains focus, |immersive_mode_controller_| will keep the
// top-of-window views revealed.
- scoped_ptr<ImmersiveRevealedLock> focus_reveal_lock(
+ std::unique_ptr<ImmersiveRevealedLock> focus_reveal_lock(
immersive_mode_controller_->GetRevealedLock(
ImmersiveModeController::ANIMATE_REVEAL_YES));
@@ -1086,7 +1087,7 @@ void BrowserView::FocusToolbar() {
// that the toolbar is visible and is considered focusable. If the
// toolbar gains focus, |immersive_mode_controller_| will keep the
// top-of-window views revealed.
- scoped_ptr<ImmersiveRevealedLock> focus_reveal_lock(
+ std::unique_ptr<ImmersiveRevealedLock> focus_reveal_lock(
immersive_mode_controller_->GetRevealedLock(
ImmersiveModeController::ANIMATE_REVEAL_YES));
@@ -1236,7 +1237,7 @@ void BrowserView::ShowUpdateChromeDialog() {
}
void BrowserView::ShowBookmarkBubble(const GURL& url, bool already_bookmarked) {
- scoped_ptr<BubbleSyncPromoDelegate> delegate;
+ std::unique_ptr<BubbleSyncPromoDelegate> delegate;
delegate.reset(new BookmarkBubbleSignInDelegate(browser_.get()));
views::View* anchor_view = GetToolbarView()->GetBookmarkBubbleAnchor();
@@ -1300,7 +1301,7 @@ void BrowserView::ShowOneClickSigninBubble(
const base::string16& email,
const base::string16& error_message,
const StartSyncCallback& start_sync_callback) {
- scoped_ptr<OneClickSigninBubbleDelegate> delegate;
+ std::unique_ptr<OneClickSigninBubbleDelegate> delegate;
delegate.reset(new OneClickSigninBubbleLinksDelegate(browser()));
views::View* anchor_view = nullptr;
@@ -1374,7 +1375,7 @@ void BrowserView::ShowAppMenu() {
return;
// Keep the top-of-window views revealed as long as the app menu is visible.
- scoped_ptr<ImmersiveRevealedLock> revealed_lock(
+ std::unique_ptr<ImmersiveRevealedLock> revealed_lock(
immersive_mode_controller_->GetRevealedLock(
ImmersiveModeController::ANIMATE_REVEAL_NO));
« no previous file with comments | « chrome/browser/ui/views/frame/browser_view.h ('k') | chrome/browser/ui/views/frame/browser_view_layout.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698