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

Side by Side Diff: chrome/browser/chromeos/app_mode/kiosk_app_data.cc

Issue 1165323004: We should use UserID object to identify users instead of username. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 6 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 unified diff | Download patch
OLDNEW
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 351 matching lines...) Expand 10 before | Expand all | Expand 10 after
362 base::WeakPtr<KioskAppData> client_; 362 base::WeakPtr<KioskAppData> client_;
363 363
364 DISALLOW_COPY_AND_ASSIGN(WebstoreDataParser); 364 DISALLOW_COPY_AND_ASSIGN(WebstoreDataParser);
365 }; 365 };
366 366
367 //////////////////////////////////////////////////////////////////////////////// 367 ////////////////////////////////////////////////////////////////////////////////
368 // KioskAppData 368 // KioskAppData
369 369
370 KioskAppData::KioskAppData(KioskAppDataDelegate* delegate, 370 KioskAppData::KioskAppData(KioskAppDataDelegate* delegate,
371 const std::string& app_id, 371 const std::string& app_id,
372 const std::string& user_id, 372 const user_manager::UserID& user_id,
373 const GURL& update_url) 373 const GURL& update_url)
374 : delegate_(delegate), 374 : delegate_(delegate),
375 status_(STATUS_INIT), 375 status_(STATUS_INIT),
376 app_id_(app_id), 376 app_id_(app_id),
377 user_id_(user_id), 377 user_id_(user_id),
378 update_url_(update_url) { 378 update_url_(update_url) {
379 } 379 }
380 380
381 KioskAppData::~KioskAppData() {} 381 KioskAppData::~KioskAppData() {}
382 382
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
654 654
655 SkBitmap icon = crx_loader->icon(); 655 SkBitmap icon = crx_loader->icon();
656 if (icon.empty()) 656 if (icon.empty())
657 icon = *extensions::util::GetDefaultAppIcon().bitmap(); 657 icon = *extensions::util::GetDefaultAppIcon().bitmap();
658 SetCache(crx_loader->name(), icon); 658 SetCache(crx_loader->name(), icon);
659 659
660 SetStatus(STATUS_LOADED); 660 SetStatus(STATUS_LOADED);
661 } 661 }
662 662
663 } // namespace chromeos 663 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698