ui/wm/core/focus_controller.h - Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui

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: ui/wm/core/focus_controller.h

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc

Patch Set: scopedptrui: rebase-make_scoped_ptr 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

Index: ui/wm/core/focus_controller.h

diff --git a/ui/wm/core/focus_controller.h b/ui/wm/core/focus_controller.h

index 58863143b78890f9bb2b9423b55490736007395b..814697f81b8df6700d1f1d8e820424b16f7889e7 100644

--- a/ui/wm/core/focus_controller.h

+++ b/ui/wm/core/focus_controller.h

@@ -5,9 +5,10 @@

#ifndef UI_WM_CORE_FOCUS_CONTROLLER_H_

#define UI_WM_CORE_FOCUS_CONTROLLER_H_

+#include <memory>

#include "base/compiler_specific.h"

#include "base/macros.h"

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

#include "base/observer_list.h"

#include "base/scoped_observer.h"

#include "ui/aura/client/focus_client.h"

@@ -122,7 +123,7 @@ class WM_EXPORT FocusController : public aura::client::ActivationClient,

bool updating_focus_;

bool updating_activation_;

- scoped_ptr<FocusRules> rules_;

+ std::unique_ptr<FocusRules> rules_;

base::ObserverList<aura::client::ActivationChangeObserver>

activation_observers_;

« no previous file with comments | « ui/wm/core/cursor_manager_unittest.cc ('k') | ui/wm/core/focus_controller_unittest.cc » ('j') | no next file with comments »