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

Unified Diff: chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.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
Index: chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
diff --git a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
index 48fb019b3b951b3d6252ffc6d13ee973c0e20556..79ae132e61a1406085a238c39c69c5b8ba6e8e4d 100644
--- a/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
+++ b/chrome/browser/chromeos/input_method/component_extension_ime_manager_impl.cc
@@ -166,15 +166,17 @@ void ComponentExtensionIMEManagerImpl::Unload(Profile* profile,
GetComponentLoader(profile)->Remove(extension_id);
}
-scoped_ptr<base::DictionaryValue> ComponentExtensionIMEManagerImpl::GetManifest(
+std::unique_ptr<base::DictionaryValue>
+ComponentExtensionIMEManagerImpl::GetManifest(
const std::string& manifest_string) {
std::string error;
JSONStringValueDeserializer deserializer(manifest_string);
- scoped_ptr<base::Value> manifest = deserializer.Deserialize(NULL, &error);
+ std::unique_ptr<base::Value> manifest =
+ deserializer.Deserialize(NULL, &error);
if (!manifest.get())
LOG(ERROR) << "Failed at getting manifest";
- return scoped_ptr<base::DictionaryValue>(
+ return std::unique_ptr<base::DictionaryValue>(
static_cast<base::DictionaryValue*>(manifest.release()));
}
@@ -303,7 +305,7 @@ void ComponentExtensionIMEManagerImpl::ReadComponentExtensionsInfo(
if (component_ime.manifest.empty())
continue;
- scoped_ptr<base::DictionaryValue> manifest =
+ std::unique_ptr<base::DictionaryValue> manifest =
GetManifest(component_ime.manifest);
if (!manifest.get())
continue;

Powered by Google App Engine
This is Rietveld 408576698