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

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: Fixed unit tests. Created 4 years, 9 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 "base/time/time.h" 18 #include "base/time/time.h"
19 #include "chrome/browser/chromeos/app_mode/kiosk_app_data_delegate.h" 19 #include "chrome/browser/chromeos/app_mode/kiosk_app_data_delegate.h"
20 #include "chrome/browser/chromeos/extensions/external_cache.h" 20 #include "chrome/browser/chromeos/extensions/external_cache.h"
21 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h" 21 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
22 #include "chrome/browser/chromeos/settings/cros_settings.h" 22 #include "chrome/browser/chromeos/settings/cros_settings.h"
23 #include "components/signin/core/account_id/account_id.h"
23 #include "ui/gfx/image/image_skia.h" 24 #include "ui/gfx/image/image_skia.h"
24 25
25 class PrefRegistrySimple; 26 class PrefRegistrySimple;
26 class Profile; 27 class Profile;
27 28
28 namespace base { 29 namespace base {
29 class RefCountedString; 30 class RefCountedString;
30 } 31 }
31 32
32 namespace extensions { 33 namespace extensions {
(...skipping 30 matching lines...) Expand all
63 64
64 // Struct to hold app info returned from GetApps() call. 65 // Struct to hold app info returned from GetApps() call.
65 struct App { 66 struct App {
66 App(const KioskAppData& data, 67 App(const KioskAppData& data,
67 bool is_extension_pending, 68 bool is_extension_pending,
68 bool was_auto_launched_with_zero_delay); 69 bool was_auto_launched_with_zero_delay);
69 App(); 70 App();
70 ~App(); 71 ~App();
71 72
72 std::string app_id; 73 std::string app_id;
73 std::string user_id; 74 AccountId account_id;
74 std::string name; 75 std::string name;
75 gfx::ImageSkia icon; 76 gfx::ImageSkia icon;
76 std::string required_platform_version; 77 std::string required_platform_version;
77 bool is_loading; 78 bool is_loading;
78 bool was_auto_launched_with_zero_delay; 79 bool was_auto_launched_with_zero_delay;
79 }; 80 };
80 typedef std::vector<App> Apps; 81 typedef std::vector<App> Apps;
81 82
82 // Name of a dictionary that holds kiosk app info in Local State. 83 // Name of a dictionary that holds kiosk app info in Local State.
83 // Sample layout: 84 // Sample layout:
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
323 base::WeakPtr<KioskAppExternalLoader> secondary_app_external_loader_; 324 base::WeakPtr<KioskAppExternalLoader> secondary_app_external_loader_;
324 325
325 scoped_ptr<AppSession> app_session_; 326 scoped_ptr<AppSession> app_session_;
326 327
327 DISALLOW_COPY_AND_ASSIGN(KioskAppManager); 328 DISALLOW_COPY_AND_ASSIGN(KioskAppManager);
328 }; 329 };
329 330
330 } // namespace chromeos 331 } // namespace chromeos
331 332
332 #endif // CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_MANAGER_H_ 333 #endif // CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_MANAGER_H_
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/app_mode/kiosk_app_data.cc ('k') | chrome/browser/chromeos/app_mode/kiosk_app_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698