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

Unified Diff: chrome/browser/chromeos/app_mode/kiosk_app_data.h

Issue 1693383003: ChromeOS cryptohome should be able to use gaia id as user identifier. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add missing files. Created 4 years, 10 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/app_mode/kiosk_app_data.h
diff --git a/chrome/browser/chromeos/app_mode/kiosk_app_data.h b/chrome/browser/chromeos/app_mode/kiosk_app_data.h
index 57509e698f368f1a2573d794b7f1cb2415e2f6b1..fca5294650d0168f0dfdb5c1f56130478df2f8c3 100644
--- a/chrome/browser/chromeos/app_mode/kiosk_app_data.h
+++ b/chrome/browser/chromeos/app_mode/kiosk_app_data.h
@@ -12,6 +12,7 @@
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
#include "chrome/browser/extensions/webstore_data_fetcher_delegate.h"
+#include "components/signin/core/account_id/account_id.h"
#include "ui/gfx/image/image_skia.h"
#include "url/gurl.h"
@@ -48,7 +49,7 @@ class KioskAppData : public base::SupportsWeakPtr<KioskAppData>,
KioskAppData(KioskAppDataDelegate* delegate,
const std::string& app_id,
- const std::string& user_id,
+ const AccountId& account_id,
const GURL& update_url);
~KioskAppData() override;
@@ -73,7 +74,7 @@ class KioskAppData : public base::SupportsWeakPtr<KioskAppData>,
bool IsFromWebStore() const;
const std::string& app_id() const { return app_id_; }
- const std::string& user_id() const { return user_id_; }
+ const AccountId& account_id() const { return account_id_; }
const std::string& name() const { return name_; }
const GURL& update_url() const { return update_url_; }
const gfx::ImageSkia& icon() const { return icon_; }
@@ -135,7 +136,7 @@ class KioskAppData : public base::SupportsWeakPtr<KioskAppData>,
Status status_;
std::string app_id_;
- std::string user_id_;
+ AccountId account_id_;
std::string name_;
GURL update_url_;
gfx::ImageSkia icon_;

Powered by Google App Engine
This is Rietveld 408576698