OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/chromeos/system/ash_system_tray_delegate.h" | 5 #include "chrome/browser/chromeos/system/ash_system_tray_delegate.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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 #include "chrome/browser/chromeos/cros/network_library.h" | 51 #include "chrome/browser/chromeos/cros/network_library.h" |
52 #include "chrome/browser/chromeos/drive/drive_system_service.h" | 52 #include "chrome/browser/chromeos/drive/drive_system_service.h" |
53 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" | 53 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" |
54 #include "chrome/browser/chromeos/input_method/input_method_manager.h" | 54 #include "chrome/browser/chromeos/input_method/input_method_manager.h" |
55 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 55 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
56 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" | 56 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" |
57 #include "chrome/browser/chromeos/login/help_app_launcher.h" | 57 #include "chrome/browser/chromeos/login/help_app_launcher.h" |
58 #include "chrome/browser/chromeos/login/login_display_host.h" | 58 #include "chrome/browser/chromeos/login/login_display_host.h" |
59 #include "chrome/browser/chromeos/login/login_display_host_impl.h" | 59 #include "chrome/browser/chromeos/login/login_display_host_impl.h" |
60 #include "chrome/browser/chromeos/login/login_wizard.h" | 60 #include "chrome/browser/chromeos/login/login_wizard.h" |
| 61 #include "chrome/browser/chromeos/login/startup_utils.h" |
61 #include "chrome/browser/chromeos/login/user.h" | 62 #include "chrome/browser/chromeos/login/user.h" |
62 #include "chrome/browser/chromeos/login/user_manager.h" | 63 #include "chrome/browser/chromeos/login/user_manager.h" |
63 #include "chrome/browser/chromeos/login/wizard_controller.h" | |
64 #include "chrome/browser/chromeos/mobile_config.h" | 64 #include "chrome/browser/chromeos/mobile_config.h" |
65 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" | 65 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" |
66 #include "chrome/browser/chromeos/status/data_promo_notification.h" | 66 #include "chrome/browser/chromeos/status/data_promo_notification.h" |
67 #include "chrome/browser/chromeos/status/network_menu.h" | 67 #include "chrome/browser/chromeos/status/network_menu.h" |
68 #include "chrome/browser/chromeos/status/network_menu_icon.h" | 68 #include "chrome/browser/chromeos/status/network_menu_icon.h" |
69 #include "chrome/browser/chromeos/system/timezone_settings.h" | 69 #include "chrome/browser/chromeos/system/timezone_settings.h" |
70 #include "chrome/browser/chromeos/system_key_event_listener.h" | 70 #include "chrome/browser/chromeos/system_key_event_listener.h" |
71 #include "chrome/browser/google/google_util.h" | 71 #include "chrome/browser/google/google_util.h" |
72 #include "chrome/browser/google_apis/drive_service_interface.h" | 72 #include "chrome/browser/google_apis/drive_service_interface.h" |
73 #include "chrome/browser/lifetime/application_lifetime.h" | 73 #include "chrome/browser/lifetime/application_lifetime.h" |
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
410 case LoginState::LOGGED_IN_USER_LOCALLY_MANAGED: | 410 case LoginState::LOGGED_IN_USER_LOCALLY_MANAGED: |
411 return ash::user::LOGGED_IN_LOCALLY_MANAGED; | 411 return ash::user::LOGGED_IN_LOCALLY_MANAGED; |
412 case LoginState::LOGGED_IN_USER_KIOSK_APP: | 412 case LoginState::LOGGED_IN_USER_KIOSK_APP: |
413 return ash::user::LOGGED_IN_KIOSK_APP; | 413 return ash::user::LOGGED_IN_KIOSK_APP; |
414 } | 414 } |
415 NOTREACHED(); | 415 NOTREACHED(); |
416 return ash::user::LOGGED_IN_NONE; | 416 return ash::user::LOGGED_IN_NONE; |
417 } | 417 } |
418 | 418 |
419 virtual bool IsOobeCompleted() const OVERRIDE { | 419 virtual bool IsOobeCompleted() const OVERRIDE { |
420 return WizardController::IsOobeCompleted(); | 420 return StartupUtils::IsOobeCompleted(); |
421 } | 421 } |
422 | 422 |
423 virtual void GetLoggedInUsers(ash::UserEmailList* users) OVERRIDE { | 423 virtual void GetLoggedInUsers(ash::UserEmailList* users) OVERRIDE { |
424 const UserList& logged_in_users = UserManager::Get()->GetLoggedInUsers(); | 424 const UserList& logged_in_users = UserManager::Get()->GetLoggedInUsers(); |
425 for (UserList::const_iterator it = logged_in_users.begin(); | 425 for (UserList::const_iterator it = logged_in_users.begin(); |
426 it != logged_in_users.end(); ++it) { | 426 it != logged_in_users.end(); ++it) { |
427 const User* user = (*it); | 427 const User* user = (*it); |
428 users->push_back(user->email()); | 428 users->push_back(user->email()); |
429 } | 429 } |
430 } | 430 } |
(...skipping 1168 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1599 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); | 1599 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); |
1600 }; | 1600 }; |
1601 | 1601 |
1602 } // namespace | 1602 } // namespace |
1603 | 1603 |
1604 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1604 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
1605 return new chromeos::SystemTrayDelegate(); | 1605 return new chromeos::SystemTrayDelegate(); |
1606 } | 1606 } |
1607 | 1607 |
1608 } // namespace chromeos | 1608 } // namespace chromeos |
OLD | NEW |