chrome/browser/chromeos/preferences.h - Issue 1870793002: Convert //chrome/browser/chromeos 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/chromeos/preferences.h

Issue 1870793002: Convert //chrome/browser/chromeos 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/chromeos/power/renderer_freezer_unittest.cc ('k') | chrome/browser/chromeos/preferences_chromeos_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/preferences.h

diff --git a/chrome/browser/chromeos/preferences.h b/chrome/browser/chromeos/preferences.h

index 1a0e8fb326162ba8da10a7a76ceeb3d6ebd593ab..fe0e49adba19ad29f1baf06cc71a8bc1656b4fe6 100644

--- a/chrome/browser/chromeos/preferences.h

+++ b/chrome/browser/chromeos/preferences.h

@@ -118,7 +118,7 @@ class Preferences : public syncable_prefs::PrefServiceSyncableObserver,

syncable_prefs::PrefServiceSyncable* prefs_;

input_method::InputMethodManager* input_method_manager_;

- scoped_ptr<TracingManager> tracing_manager_;

+ std::unique_ptr<TracingManager> tracing_manager_;

BooleanPrefMember performance_tracing_enabled_;

BooleanPrefMember tap_to_click_enabled_;

@@ -158,7 +158,7 @@ class Preferences : public syncable_prefs::PrefServiceSyncableObserver,

// Input Methods state for this user.

scoped_refptr<input_method::InputMethodManager::State> ime_state_;

- scoped_ptr<input_method::InputMethodSyncer> input_method_syncer_;

+ std::unique_ptr<input_method::InputMethodSyncer> input_method_syncer_;

DISALLOW_COPY_AND_ASSIGN(Preferences);

};