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

Side by Side Diff: chrome/browser/chromeos/app_mode/kiosk_app_manager.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 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 #ifndef CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_MANAGER_H_ 5 #ifndef CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_MANAGER_H_
6 #define CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_MANAGER_H_ 6 #define CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_MANAGER_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <string> 9 #include <string>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/callback_forward.h" 12 #include "base/callback_forward.h"
13 #include "base/lazy_instance.h" 13 #include "base/lazy_instance.h"
14 #include "base/macros.h" 14 #include "base/macros.h"
15 #include "base/memory/scoped_ptr.h" 15 #include "base/memory/scoped_ptr.h"
16 #include "base/memory/scoped_vector.h" 16 #include "base/memory/scoped_vector.h"
17 #include "base/observer_list.h" 17 #include "base/observer_list.h"
18 #include "chrome/browser/chromeos/app_mode/kiosk_app_data_delegate.h" 18 #include "chrome/browser/chromeos/app_mode/kiosk_app_data_delegate.h"
19 #include "chrome/browser/chromeos/extensions/external_cache.h" 19 #include "chrome/browser/chromeos/extensions/external_cache.h"
20 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h" 20 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
21 #include "chrome/browser/chromeos/settings/cros_settings.h" 21 #include "chrome/browser/chromeos/settings/cros_settings.h"
22 #include "components/signin/core/account_id/account_id.h"
22 #include "ui/gfx/image/image_skia.h" 23 #include "ui/gfx/image/image_skia.h"
23 24
24 class PrefRegistrySimple; 25 class PrefRegistrySimple;
25 class Profile; 26 class Profile;
26 27
27 namespace base { 28 namespace base {
28 class RefCountedString; 29 class RefCountedString;
29 } 30 }
30 31
31 namespace extensions { 32 namespace extensions {
(...skipping 30 matching lines...) Expand all
62 63
63 // Struct to hold app info returned from GetApps() call. 64 // Struct to hold app info returned from GetApps() call.
64 struct App { 65 struct App {
65 App(const KioskAppData& data, 66 App(const KioskAppData& data,
66 bool is_extension_pending, 67 bool is_extension_pending,
67 bool was_auto_launched_with_zero_delay); 68 bool was_auto_launched_with_zero_delay);
68 App(); 69 App();
69 ~App(); 70 ~App();
70 71
71 std::string app_id; 72 std::string app_id;
72 std::string user_id; 73 AccountId account_id;
73 std::string name; 74 std::string name;
74 gfx::ImageSkia icon; 75 gfx::ImageSkia icon;
75 bool is_loading; 76 bool is_loading;
76 bool was_auto_launched_with_zero_delay; 77 bool was_auto_launched_with_zero_delay;
77 }; 78 };
78 typedef std::vector<App> Apps; 79 typedef std::vector<App> Apps;
79 80
80 // Name of a dictionary that holds kiosk app info in Local State. 81 // Name of a dictionary that holds kiosk app info in Local State.
81 // Sample layout: 82 // Sample layout:
82 // "kiosk": { 83 // "kiosk": {
(...skipping 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 base::WeakPtr<KioskAppExternalLoader> secondary_app_external_loader_; 315 base::WeakPtr<KioskAppExternalLoader> secondary_app_external_loader_;
315 316
316 scoped_ptr<AppSession> app_session_; 317 scoped_ptr<AppSession> app_session_;
317 318
318 DISALLOW_COPY_AND_ASSIGN(KioskAppManager); 319 DISALLOW_COPY_AND_ASSIGN(KioskAppManager);
319 }; 320 };
320 321
321 } // namespace chromeos 322 } // namespace chromeos
322 323
323 #endif // CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_MANAGER_H_ 324 #endif // CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698