chrome/browser/ui/views/ash/tab_scrubber.h - Issue 1865213004: Convert //chrome/browser/ui from scoped_ptr to std::unique_ptr

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/ash/tab_scrubber.h

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/apps/shaped_app_window_targeter_unittest.cc ('k') | chrome/browser/ui/views/ash/tab_scrubber_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/ash/tab_scrubber.h

diff --git a/chrome/browser/ui/views/ash/tab_scrubber.h b/chrome/browser/ui/views/ash/tab_scrubber.h

index ea63c3718d9224a95d0dfa561e0f6726e5f19419..668670e74b323361b6bedad0eb15de18cc23dd94 100644

--- a/chrome/browser/ui/views/ash/tab_scrubber.h

+++ b/chrome/browser/ui/views/ash/tab_scrubber.h

@@ -5,8 +5,9 @@

#ifndef CHROME_BROWSER_UI_VIEWS_ASH_TAB_SCRUBBER_H_

#define CHROME_BROWSER_UI_VIEWS_ASH_TAB_SCRUBBER_H_

+#include <memory>

#include "base/macros.h"

-#include "base/memory/scoped_ptr.h"

#include "base/timer/timer.h"

#include "chrome/browser/ui/views/frame/immersive_mode_controller.h"

#include "chrome/browser/ui/views/tabs/tab_strip_observer.h"

@@ -107,7 +108,7 @@ class TabScrubber : public ui::EventHandler,

// Set if activation_delay had been explicitly set.

bool use_default_activation_delay_;

// Forces the tabs to be revealed if we are in immersive fullscreen.

- scoped_ptr<ImmersiveRevealedLock> immersive_reveal_lock_;

+ std::unique_ptr<ImmersiveRevealedLock> immersive_reveal_lock_;

content::NotificationRegistrar registrar_;

base::WeakPtrFactory<TabScrubber> weak_ptr_factory_;