chrome/browser/chromeos/settings/system_settings_provider.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/settings/system_settings_provider.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/settings/stub_cros_settings_provider_unittest.cc ('k') | chrome/browser/chromeos/settings/token_encryptor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/settings/system_settings_provider.h

diff --git a/chrome/browser/chromeos/settings/system_settings_provider.h b/chrome/browser/chromeos/settings/system_settings_provider.h

index 886f811302d24d77b683ea0bf4f1f0c2ba640085..802beb5b5d9505ce6cf23e9fca05ca4ce47f126b 100644

--- a/chrome/browser/chromeos/settings/system_settings_provider.h

+++ b/chrome/browser/chromeos/settings/system_settings_provider.h

@@ -5,11 +5,11 @@

#ifndef CHROME_BROWSER_CHROMEOS_SETTINGS_SYSTEM_SETTINGS_PROVIDER_H_

#define CHROME_BROWSER_CHROMEOS_SETTINGS_SYSTEM_SETTINGS_PROVIDER_H_

+#include <memory>

#include <string>

#include "base/callback.h"

#include "base/macros.h"

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

#include "chromeos/settings/cros_settings_provider.h"

#include "chromeos/settings/timezone_settings.h"

#include "third_party/icu/source/i18n/unicode/timezone.h"

@@ -38,7 +38,7 @@ class SystemSettingsProvider : public CrosSettingsProvider,

// CrosSettingsProvider implementation.

void DoSet(const std::string& path, const base::Value& in_value) override;

- scoped_ptr<base::StringValue> timezone_value_;

+ std::unique_ptr<base::StringValue> timezone_value_;

DISALLOW_COPY_AND_ASSIGN(SystemSettingsProvider);

};