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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/app_mode/startup_app_launcher.cc

Issue 1394993004: Make ValueDeserializer::Deserialize return scoped_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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
« chrome/browser/chromeos/app_mode/kiosk_external_updater.cc ('K') | « chrome/browser/chromeos/app_mode/kiosk_external_updater.cc ('k') | chrome/browser/chromeos/extensions/default_app_order.cc » ('j') | chrome/browser/chromeos/extensions/default_app_order.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/app_mode/startup_app_launcher.cc
diff --git a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc
index cb2bf6dcae3fc0c533111ae7eaa157180477d986..b41cf837a440514adda05152931cd7a336735126 100644
--- a/chrome/browser/chromeos/app_mode/startup_app_launcher.cc
+++ b/chrome/browser/chromeos/app_mode/startup_app_launcher.cc
@@ -131,8 +131,8 @@ void StartupAppLauncher::LoadOAuthFileOnBlockingPool(
base::FilePath auth_file = user_data_dir.Append(kOAuthFileName);
scoped_ptr<JSONFileValueDeserializer> deserializer(
new JSONFileValueDeserializer(user_data_dir.Append(kOAuthFileName)));
- scoped_ptr<base::Value> value(
- deserializer->Deserialize(&error_code, &error_msg));
+ scoped_ptr<base::Value> value =
+ deserializer->Deserialize(&error_code, &error_msg);
base::DictionaryValue* dict = NULL;
if (error_code != JSONFileValueDeserializer::JSON_NO_ERROR ||
!value.get() || !value->GetAsDictionary(&dict)) {
« chrome/browser/chromeos/app_mode/kiosk_external_updater.cc ('K') | « chrome/browser/chromeos/app_mode/kiosk_external_updater.cc ('k') | chrome/browser/chromeos/extensions/default_app_order.cc » ('j') | chrome/browser/chromeos/extensions/default_app_order.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698