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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
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/startup_utils.h" |
62 #include "chrome/browser/chromeos/login/supervised_user_manager.h" | 62 #include "chrome/browser/chromeos/login/supervised_user_manager.h" |
63 #include "chrome/browser/chromeos/login/user.h" | 63 #include "chrome/browser/chromeos/login/user.h" |
64 #include "chrome/browser/chromeos/login/user_adding_screen.h" | 64 #include "chrome/browser/chromeos/login/user_adding_screen.h" |
65 #include "chrome/browser/chromeos/login/user_manager.h" | 65 #include "chrome/browser/chromeos/login/user_manager.h" |
66 #include "chrome/browser/chromeos/options/network_config_view.h" | 66 #include "chrome/browser/chromeos/options/network_config_view.h" |
67 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" | 67 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" |
| 68 #include "chrome/browser/chromeos/profiles/multiprofiles_intro_view.h" |
68 #include "chrome/browser/chromeos/settings/cros_settings.h" | 69 #include "chrome/browser/chromeos/settings/cros_settings.h" |
69 #include "chrome/browser/chromeos/sim_dialog_delegate.h" | 70 #include "chrome/browser/chromeos/sim_dialog_delegate.h" |
70 #include "chrome/browser/chromeos/system_key_event_listener.h" | 71 #include "chrome/browser/chromeos/system_key_event_listener.h" |
71 #include "chrome/browser/drive/drive_service_interface.h" | 72 #include "chrome/browser/drive/drive_service_interface.h" |
72 #include "chrome/browser/feedback/tracing_manager.h" | 73 #include "chrome/browser/feedback/tracing_manager.h" |
73 #include "chrome/browser/google/google_util.h" | 74 #include "chrome/browser/google/google_util.h" |
74 #include "chrome/browser/lifetime/application_lifetime.h" | 75 #include "chrome/browser/lifetime/application_lifetime.h" |
75 #include "chrome/browser/policy/browser_policy_connector.h" | 76 #include "chrome/browser/policy/browser_policy_connector.h" |
76 #include "chrome/browser/profiles/profile_manager.h" | 77 #include "chrome/browser/profiles/profile_manager.h" |
77 #include "chrome/browser/ui/ash/volume_controller_chromeos.h" | 78 #include "chrome/browser/ui/ash/volume_controller_chromeos.h" |
(...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
622 if (UserManager::Get()->GetActiveUser()->GetType() != | 623 if (UserManager::Get()->GetActiveUser()->GetType() != |
623 User::USER_TYPE_REGULAR) { | 624 User::USER_TYPE_REGULAR) { |
624 return; | 625 return; |
625 } | 626 } |
626 | 627 |
627 if (static_cast<int>(UserManager::Get()->GetLoggedInUsers().size()) >= | 628 if (static_cast<int>(UserManager::Get()->GetLoggedInUsers().size()) >= |
628 shell->session_state_delegate()->GetMaximumNumberOfLoggedInUsers()) | 629 shell->session_state_delegate()->GetMaximumNumberOfLoggedInUsers()) |
629 return; | 630 return; |
630 | 631 |
631 // Launch sign in screen to add another user to current session. | 632 // Launch sign in screen to add another user to current session. |
632 if (UserManager::Get()->GetUsersAdmittedForMultiProfile().size()) | 633 if (UserManager::Get()->GetUsersAdmittedForMultiProfile().size()) { |
633 UserAddingScreen::Get()->Start(); | 634 bool show_intro = !ProfileManager::GetActiveUserProfile()-> |
| 635 GetPrefs()->GetBoolean(prefs::kMultiProfileIntroShowDismissed); |
| 636 if (show_intro) |
| 637 multiprofiles::IntroDialog(); |
| 638 else |
| 639 UserAddingScreen::Get()->Start(); |
| 640 } |
634 } | 641 } |
635 | 642 |
636 virtual void ShowSpringChargerReplacementDialog() OVERRIDE { | 643 virtual void ShowSpringChargerReplacementDialog() OVERRIDE { |
637 if (!ChargerReplacementDialog::ShouldShowDialog()) | 644 if (!ChargerReplacementDialog::ShouldShowDialog()) |
638 return; | 645 return; |
639 | 646 |
640 ChargerReplacementDialog* dialog = | 647 ChargerReplacementDialog* dialog = |
641 new ChargerReplacementDialog(GetNativeWindow()); | 648 new ChargerReplacementDialog(GetNativeWindow()); |
642 dialog->Show(); | 649 dialog->Show(); |
643 } | 650 } |
(...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1274 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); | 1281 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); |
1275 }; | 1282 }; |
1276 | 1283 |
1277 } // namespace | 1284 } // namespace |
1278 | 1285 |
1279 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1286 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
1280 return new chromeos::SystemTrayDelegate(); | 1287 return new chromeos::SystemTrayDelegate(); |
1281 } | 1288 } |
1282 | 1289 |
1283 } // namespace chromeos | 1290 } // namespace chromeos |
OLD | NEW |