Chromium Code Reviews| 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 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" | 5 #include "chrome/browser/ui/ash/system_tray_delegate_chromeos.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <set> | 8 #include <set> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 43 #include "base/time/time.h" | 43 #include "base/time/time.h" |
| 44 #include "chrome/browser/browser_process.h" | 44 #include "chrome/browser/browser_process.h" |
| 45 #include "chrome/browser/chrome_notification_types.h" | 45 #include "chrome/browser/chrome_notification_types.h" |
| 46 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" | 46 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" |
| 47 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" | 47 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" |
| 48 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h" | 48 #include "chrome/browser/chromeos/bluetooth/bluetooth_pairing_dialog.h" |
| 49 #include "chrome/browser/chromeos/charger_replace/charger_replacement_dialog.h" | 49 #include "chrome/browser/chromeos/charger_replace/charger_replacement_dialog.h" |
| 50 #include "chrome/browser/chromeos/enrollment_dialog_view.h" | 50 #include "chrome/browser/chromeos/enrollment_dialog_view.h" |
| 51 #include "chrome/browser/chromeos/events/system_key_event_listener.h" | 51 #include "chrome/browser/chromeos/events/system_key_event_listener.h" |
| 52 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 52 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
| 53 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" | |
| 54 #include "chrome/browser/chromeos/login/help_app_launcher.h" | 53 #include "chrome/browser/chromeos/login/help_app_launcher.h" |
| 55 #include "chrome/browser/chromeos/login/login_wizard.h" | 54 #include "chrome/browser/chromeos/login/login_wizard.h" |
| 56 #include "chrome/browser/chromeos/login/ui/login_display_host.h" | 55 #include "chrome/browser/chromeos/login/ui/login_display_host.h" |
| 57 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" | 56 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" |
| 58 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" | 57 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" |
| 59 #include "chrome/browser/chromeos/login/user_flow.h" | 58 #include "chrome/browser/chromeos/login/user_flow.h" |
| 60 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" | 59 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" |
| 61 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" | 60 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h" |
| 62 #include "chrome/browser/chromeos/options/network_config_view.h" | 61 #include "chrome/browser/chromeos/options/network_config_view.h" |
| 63 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 62 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
| (...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 336 LoginState::Get()->GetLoggedInUserType(); | 335 LoginState::Get()->GetLoggedInUserType(); |
| 337 switch (user_type) { | 336 switch (user_type) { |
| 338 case LoginState::LOGGED_IN_USER_NONE: | 337 case LoginState::LOGGED_IN_USER_NONE: |
| 339 return ash::user::LOGGED_IN_NONE; | 338 return ash::user::LOGGED_IN_NONE; |
| 340 case LoginState::LOGGED_IN_USER_REGULAR: | 339 case LoginState::LOGGED_IN_USER_REGULAR: |
| 341 return ash::user::LOGGED_IN_USER; | 340 return ash::user::LOGGED_IN_USER; |
| 342 case LoginState::LOGGED_IN_USER_OWNER: | 341 case LoginState::LOGGED_IN_USER_OWNER: |
| 343 return ash::user::LOGGED_IN_OWNER; | 342 return ash::user::LOGGED_IN_OWNER; |
| 344 case LoginState::LOGGED_IN_USER_GUEST: | 343 case LoginState::LOGGED_IN_USER_GUEST: |
| 345 return ash::user::LOGGED_IN_GUEST; | 344 return ash::user::LOGGED_IN_GUEST; |
| 346 case LoginState::LOGGED_IN_USER_RETAIL_MODE: | |
| 347 return ash::user::LOGGED_IN_RETAIL_MODE; | |
|
bartfab (slow)
2014/10/15 09:52:21
Remove this constant from ash/system/user/login_st
rkc
2014/11/20 21:06:34
Done.
| |
| 348 case LoginState::LOGGED_IN_USER_PUBLIC_ACCOUNT: | 345 case LoginState::LOGGED_IN_USER_PUBLIC_ACCOUNT: |
| 349 return ash::user::LOGGED_IN_PUBLIC; | 346 return ash::user::LOGGED_IN_PUBLIC; |
| 350 case LoginState::LOGGED_IN_USER_SUPERVISED: | 347 case LoginState::LOGGED_IN_USER_SUPERVISED: |
| 351 return ash::user::LOGGED_IN_SUPERVISED; | 348 return ash::user::LOGGED_IN_SUPERVISED; |
| 352 case LoginState::LOGGED_IN_USER_KIOSK_APP: | 349 case LoginState::LOGGED_IN_USER_KIOSK_APP: |
| 353 return ash::user::LOGGED_IN_KIOSK_APP; | 350 return ash::user::LOGGED_IN_KIOSK_APP; |
| 354 } | 351 } |
| 355 NOTREACHED(); | 352 NOTREACHED(); |
| 356 return ash::user::LOGGED_IN_NONE; | 353 return ash::user::LOGGED_IN_NONE; |
| 357 } | 354 } |
| (...skipping 937 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1295 accessibility_subscription_.reset(); | 1292 accessibility_subscription_.reset(); |
| 1296 else | 1293 else |
| 1297 OnAccessibilityModeChanged(details.notify); | 1294 OnAccessibilityModeChanged(details.notify); |
| 1298 } | 1295 } |
| 1299 | 1296 |
| 1300 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1297 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
| 1301 return new SystemTrayDelegateChromeOS(); | 1298 return new SystemTrayDelegateChromeOS(); |
| 1302 } | 1299 } |
| 1303 | 1300 |
| 1304 } // namespace chromeos | 1301 } // namespace chromeos |
| OLD | NEW |