| OLD | NEW |
| 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 |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 // finished installing (e.g. because old version is still running). Otherwise, | 146 // finished installing (e.g. because old version is still running). Otherwise, |
| 147 // |app| could be NULL and the current installed app in |profile| will be | 147 // |app| could be NULL and the current installed app in |profile| will be |
| 148 // used. | 148 // used. |
| 149 void UpdateAppDataFromProfile(const std::string& app_id, | 149 void UpdateAppDataFromProfile(const std::string& app_id, |
| 150 Profile* profile, | 150 Profile* profile, |
| 151 const extensions::Extension* app); | 151 const extensions::Extension* app); |
| 152 | 152 |
| 153 void AddObserver(KioskAppManagerObserver* observer); | 153 void AddObserver(KioskAppManagerObserver* observer); |
| 154 void RemoveObserver(KioskAppManagerObserver* observer); | 154 void RemoveObserver(KioskAppManagerObserver* observer); |
| 155 | 155 |
| 156 void UpdateKeyboardLayout(); |
| 157 |
| 156 private: | 158 private: |
| 157 friend struct base::DefaultLazyInstanceTraits<KioskAppManager>; | 159 friend struct base::DefaultLazyInstanceTraits<KioskAppManager>; |
| 158 friend struct base::DefaultDeleter<KioskAppManager>; | 160 friend struct base::DefaultDeleter<KioskAppManager>; |
| 159 friend class KioskAppManagerTest; | 161 friend class KioskAppManagerTest; |
| 160 friend class KioskTest; | 162 friend class KioskTest; |
| 161 | 163 |
| 162 enum AutoLoginState { | 164 enum AutoLoginState { |
| 163 AUTOLOGIN_NONE = 0, | 165 AUTOLOGIN_NONE = 0, |
| 164 AUTOLOGIN_REQUESTED = 1, | 166 AUTOLOGIN_REQUESTED = 1, |
| 165 AUTOLOGIN_APPROVED = 2, | 167 AUTOLOGIN_APPROVED = 2, |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 // True if machine ownership is already established. | 223 // True if machine ownership is already established. |
| 222 bool ownership_established_; | 224 bool ownership_established_; |
| 223 ScopedVector<KioskAppData> apps_; | 225 ScopedVector<KioskAppData> apps_; |
| 224 std::string auto_launch_app_id_; | 226 std::string auto_launch_app_id_; |
| 225 ObserverList<KioskAppManagerObserver, true> observers_; | 227 ObserverList<KioskAppManagerObserver, true> observers_; |
| 226 | 228 |
| 227 scoped_ptr<CrosSettings::ObserverSubscription> | 229 scoped_ptr<CrosSettings::ObserverSubscription> |
| 228 local_accounts_subscription_; | 230 local_accounts_subscription_; |
| 229 scoped_ptr<CrosSettings::ObserverSubscription> | 231 scoped_ptr<CrosSettings::ObserverSubscription> |
| 230 local_account_auto_login_id_subscription_; | 232 local_account_auto_login_id_subscription_; |
| 233 // Virtual keyboard layout subscription. |
| 234 scoped_ptr<CrosSettings::ObserverSubscription> keyboard_layout_subscription_; |
| 231 | 235 |
| 232 scoped_ptr<ExternalCache> external_cache_; | 236 scoped_ptr<ExternalCache> external_cache_; |
| 233 | 237 |
| 234 DISALLOW_COPY_AND_ASSIGN(KioskAppManager); | 238 DISALLOW_COPY_AND_ASSIGN(KioskAppManager); |
| 235 }; | 239 }; |
| 236 | 240 |
| 237 } // namespace chromeos | 241 } // namespace chromeos |
| 238 | 242 |
| 239 #endif // CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_MANAGER_H_ | 243 #endif // CHROME_BROWSER_CHROMEOS_APP_MODE_KIOSK_APP_MANAGER_H_ |
| OLD | NEW |