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

Unified Diff: chrome/browser/chromeos/base/locale_util.cc

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/base/locale_util.h ('k') | chrome/browser/chromeos/boot_times_recorder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/base/locale_util.cc
diff --git a/chrome/browser/chromeos/base/locale_util.cc b/chrome/browser/chromeos/base/locale_util.cc
index 1499049bf83056c976df6ed4d2c47c7786b8a815..e3c68b883cd68db04929f7a3332f7dd6207e68a7 100644
--- a/chrome/browser/chromeos/base/locale_util.cc
+++ b/chrome/browser/chromeos/base/locale_util.cc
@@ -55,7 +55,7 @@ void SwitchLanguageDoReloadLocale(SwitchLanguageData* data) {
}
// Callback after SwitchLanguageDoReloadLocale() back in UI thread.
-void FinishSwitchLanguage(scoped_ptr<SwitchLanguageData> data) {
+void FinishSwitchLanguage(std::unique_ptr<SwitchLanguageData> data) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
if (data->result.success) {
g_browser_process->SetApplicationLocale(data->result.loaded_locale);
@@ -115,7 +115,7 @@ void SwitchLanguage(const std::string& locale,
const SwitchLanguageCallback& callback,
Profile* profile) {
DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
- scoped_ptr<SwitchLanguageData> data(
+ std::unique_ptr<SwitchLanguageData> data(
new SwitchLanguageData(locale, enable_locale_keyboard_layouts,
login_layouts_only, callback, profile));
base::Closure reloader(
« no previous file with comments | « chrome/browser/chromeos/base/locale_util.h ('k') | chrome/browser/chromeos/boot_times_recorder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698