OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/chromeos/app_mode/kiosk_app_data.h" | 5 #include "chrome/browser/chromeos/app_mode/kiosk_app_data.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
250 base::WeakPtr<KioskAppData> client_; | 250 base::WeakPtr<KioskAppData> client_; |
251 | 251 |
252 DISALLOW_COPY_AND_ASSIGN(WebstoreDataParser); | 252 DISALLOW_COPY_AND_ASSIGN(WebstoreDataParser); |
253 }; | 253 }; |
254 | 254 |
255 //////////////////////////////////////////////////////////////////////////////// | 255 //////////////////////////////////////////////////////////////////////////////// |
256 // KioskAppData | 256 // KioskAppData |
257 | 257 |
258 KioskAppData::KioskAppData(KioskAppDataDelegate* delegate, | 258 KioskAppData::KioskAppData(KioskAppDataDelegate* delegate, |
259 const std::string& app_id, | 259 const std::string& app_id, |
260 const std::string& user_id) | 260 const std::string& user_id, |
| 261 const GURL& update_url) |
261 : delegate_(delegate), | 262 : delegate_(delegate), |
262 status_(STATUS_INIT), | 263 status_(STATUS_INIT), |
263 app_id_(app_id), | 264 app_id_(app_id), |
264 user_id_(user_id) { | 265 user_id_(user_id), |
| 266 update_url_(update_url) { |
265 } | 267 } |
266 | 268 |
267 KioskAppData::~KioskAppData() {} | 269 KioskAppData::~KioskAppData() {} |
268 | 270 |
269 void KioskAppData::Load() { | 271 void KioskAppData::Load() { |
270 SetStatus(STATUS_LOADING); | 272 SetStatus(STATUS_LOADING); |
271 | 273 |
272 if (LoadFromCache()) | 274 if (LoadFromCache()) |
273 return; | 275 return; |
274 | 276 |
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
496 if (!response->GetString(key, value)) { | 498 if (!response->GetString(key, value)) { |
497 LOG(ERROR) << "Webstore response error (" << key | 499 LOG(ERROR) << "Webstore response error (" << key |
498 << "): " << ValueToString(response); | 500 << "): " << ValueToString(response); |
499 OnWebstoreResponseParseFailure(kInvalidWebstoreResponseError); | 501 OnWebstoreResponseParseFailure(kInvalidWebstoreResponseError); |
500 return false; | 502 return false; |
501 } | 503 } |
502 return true; | 504 return true; |
503 } | 505 } |
504 | 506 |
505 } // namespace chromeos | 507 } // namespace chromeos |
OLD | NEW |