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

Side by Side Diff: chrome/browser/chromeos/app_mode/kiosk_app_manager.h

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 #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 <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
11 #include "base/basictypes.h" 11 #include "base/basictypes.h"
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/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/memory/scoped_vector.h" 15 #include "base/memory/scoped_vector.h"
16 #include "base/observer_list.h" 16 #include "base/observer_list.h"
17 #include "chrome/browser/chromeos/app_mode/kiosk_app_data_delegate.h" 17 #include "chrome/browser/chromeos/app_mode/kiosk_app_data_delegate.h"
18 #include "chrome/browser/chromeos/extensions/external_cache.h" 18 #include "chrome/browser/chromeos/extensions/external_cache.h"
19 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h" 19 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
20 #include "chrome/browser/chromeos/settings/cros_settings.h" 20 #include "chrome/browser/chromeos/settings/cros_settings.h"
21 #include "components/user_manager/user_id.h"
21 #include "ui/gfx/image/image_skia.h" 22 #include "ui/gfx/image/image_skia.h"
22 23
23 class PrefRegistrySimple; 24 class PrefRegistrySimple;
24 class Profile; 25 class Profile;
25 26
26 namespace base { 27 namespace base {
27 class RefCountedString; 28 class RefCountedString;
28 } 29 }
29 30
30 namespace extensions { 31 namespace extensions {
(...skipping 29 matching lines...) Expand all
60 61
61 // Struct to hold app info returned from GetApps() call. 62 // Struct to hold app info returned from GetApps() call.
62 struct App { 63 struct App {
63 App(const KioskAppData& data, 64 App(const KioskAppData& data,
64 bool is_extension_pending, 65 bool is_extension_pending,
65 bool was_auto_launched_with_zero_delay); 66 bool was_auto_launched_with_zero_delay);
66 App(); 67 App();
67 ~App(); 68 ~App();
68 69
69 std::string app_id; 70 std::string app_id;
70 std::string user_id; 71 user_manager::UserID user_id;
71 std::string name; 72 std::string name;
72 gfx::ImageSkia icon; 73 gfx::ImageSkia icon;
73 bool is_loading; 74 bool is_loading;
74 bool was_auto_launched_with_zero_delay; 75 bool was_auto_launched_with_zero_delay;
75 }; 76 };
76 typedef std::vector<App> Apps; 77 typedef std::vector<App> Apps;
77 78
78 // Name of a dictionary that holds kiosk app info in Local State. 79 // Name of a dictionary that holds kiosk app info in Local State.
79 // Sample layout: 80 // Sample layout:
80 // "kiosk": { 81 // "kiosk": {
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 // The extension external loader for installing kiosk app. 292 // The extension external loader for installing kiosk app.
292 bool external_loader_created_; 293 bool external_loader_created_;
293 base::WeakPtr<KioskAppExternalLoader> external_loader_; 294 base::WeakPtr<KioskAppExternalLoader> external_loader_;
294 295
295 DISALLOW_COPY_AND_ASSIGN(KioskAppManager); 296 DISALLOW_COPY_AND_ASSIGN(KioskAppManager);
296 }; 297 };
297 298
298 } // namespace chromeos 299 } // namespace chromeos
299 300
300 #endif // CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_MANAGER_H_ 301 #endif // CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698