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

Unified Diff: trunk/src/chrome/browser/chromeos/app_mode/kiosk_app_data.cc

Issue 58773002: Revert 232877 "Switch the WebstoreDataFetcherDelegate::OnWebstor..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 1 month 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: trunk/src/chrome/browser/chromeos/app_mode/kiosk_app_data.cc
===================================================================
--- trunk/src/chrome/browser/chromeos/app_mode/kiosk_app_data.cc (revision 232879)
+++ trunk/src/chrome/browser/chromeos/app_mode/kiosk_app_data.cc (working copy)
@@ -409,27 +409,28 @@
}
void KioskAppData::OnWebstoreResponseParseSuccess(
- scoped_ptr<base::DictionaryValue> webstore_data) {
+ base::DictionaryValue* webstore_data) {
// Takes ownership of |webstore_data|.
+ scoped_ptr<base::DictionaryValue> data(webstore_data);
+
webstore_fetcher_.reset();
std::string manifest;
- if (!CheckResponseKeyValue(webstore_data.get(), kManifestKey, &manifest))
+ if (!CheckResponseKeyValue(data.get(), kManifestKey, &manifest))
return;
- if (!CheckResponseKeyValue(webstore_data.get(), kLocalizedNameKey, &name_))
+ if (!CheckResponseKeyValue(data.get(), kLocalizedNameKey, &name_))
return;
std::string icon_url_string;
- if (!CheckResponseKeyValue(webstore_data.get(), kIconUrlKey,
- &icon_url_string))
+ if (!CheckResponseKeyValue(data.get(), kIconUrlKey, &icon_url_string))
return;
GURL icon_url = GURL(extension_urls::GetWebstoreLaunchURL()).Resolve(
icon_url_string);
if (!icon_url.is_valid()) {
LOG(ERROR) << "Webstore response error (icon url): "
- << ValueToString(webstore_data.get());
+ << ValueToString(data.get());
OnWebstoreResponseParseFailure(kInvalidWebstoreResponseError);
return;
}

Powered by Google App Engine
This is Rietveld 408576698