| 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 28 matching lines...) Expand all Loading... |
| 39 #include "base/prefs/pref_service.h" | 39 #include "base/prefs/pref_service.h" |
| 40 #include "base/strings/stringprintf.h" | 40 #include "base/strings/stringprintf.h" |
| 41 #include "base/strings/utf_string_conversions.h" | 41 #include "base/strings/utf_string_conversions.h" |
| 42 #include "base/sys_info.h" | 42 #include "base/sys_info.h" |
| 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" | |
| 50 #include "chrome/browser/chromeos/events/system_key_event_listener.h" | 49 #include "chrome/browser/chromeos/events/system_key_event_listener.h" |
| 51 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 50 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
| 52 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" | 51 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" |
| 53 #include "chrome/browser/chromeos/login/help_app_launcher.h" | 52 #include "chrome/browser/chromeos/login/help_app_launcher.h" |
| 54 #include "chrome/browser/chromeos/login/login_wizard.h" | 53 #include "chrome/browser/chromeos/login/login_wizard.h" |
| 55 #include "chrome/browser/chromeos/login/ui/login_display_host.h" | 54 #include "chrome/browser/chromeos/login/ui/login_display_host.h" |
| 56 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" | 55 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h" |
| 57 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" | 56 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h" |
| 58 #include "chrome/browser/chromeos/login/user_flow.h" | 57 #include "chrome/browser/chromeos/login/user_flow.h" |
| 59 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" | 58 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" |
| (...skipping 15 matching lines...) Expand all Loading... |
| 75 #include "chrome/browser/ui/ash/user_accounts_delegate_chromeos.h" | 74 #include "chrome/browser/ui/ash/user_accounts_delegate_chromeos.h" |
| 76 #include "chrome/browser/ui/ash/volume_controller_chromeos.h" | 75 #include "chrome/browser/ui/ash/volume_controller_chromeos.h" |
| 77 #include "chrome/browser/ui/browser.h" | 76 #include "chrome/browser/ui/browser.h" |
| 78 #include "chrome/browser/ui/browser_finder.h" | 77 #include "chrome/browser/ui/browser_finder.h" |
| 79 #include "chrome/browser/ui/browser_list.h" | 78 #include "chrome/browser/ui/browser_list.h" |
| 80 #include "chrome/browser/ui/chrome_pages.h" | 79 #include "chrome/browser/ui/chrome_pages.h" |
| 81 #include "chrome/browser/ui/host_desktop.h" | 80 #include "chrome/browser/ui/host_desktop.h" |
| 82 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" | 81 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" |
| 83 #include "chrome/browser/ui/singleton_tabs.h" | 82 #include "chrome/browser/ui/singleton_tabs.h" |
| 84 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 83 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 85 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h" | |
| 86 #include "chrome/browser/upgrade_detector.h" | 84 #include "chrome/browser/upgrade_detector.h" |
| 87 #include "chrome/common/chrome_switches.h" | 85 #include "chrome/common/chrome_switches.h" |
| 88 #include "chrome/common/pref_names.h" | 86 #include "chrome/common/pref_names.h" |
| 89 #include "chrome/common/url_constants.h" | 87 #include "chrome/common/url_constants.h" |
| 90 #include "chrome/grit/generated_resources.h" | 88 #include "chrome/grit/generated_resources.h" |
| 91 #include "chrome/grit/locale_settings.h" | 89 #include "chrome/grit/locale_settings.h" |
| 92 #include "chromeos/dbus/dbus_thread_manager.h" | 90 #include "chromeos/dbus/dbus_thread_manager.h" |
| 93 #include "chromeos/dbus/session_manager_client.h" | 91 #include "chromeos/dbus/session_manager_client.h" |
| 94 #include "chromeos/ime/extension_ime_util.h" | 92 #include "chromeos/ime/extension_ime_util.h" |
| 95 #include "chromeos/ime/ime_keyboard.h" | 93 #include "chromeos/ime/ime_keyboard.h" |
| (...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 586 if (show_intro) { | 584 if (show_intro) { |
| 587 base::Callback<void(bool)> on_accept = | 585 base::Callback<void(bool)> on_accept = |
| 588 base::Bind(&OnAcceptMultiprofilesIntro); | 586 base::Bind(&OnAcceptMultiprofilesIntro); |
| 589 ShowMultiprofilesIntroDialog(on_accept); | 587 ShowMultiprofilesIntroDialog(on_accept); |
| 590 } else { | 588 } else { |
| 591 UserAddingScreen::Get()->Start(); | 589 UserAddingScreen::Get()->Start(); |
| 592 } | 590 } |
| 593 } | 591 } |
| 594 } | 592 } |
| 595 | 593 |
| 596 bool SystemTrayDelegateChromeOS::ShowSpringChargerReplacementDialog() { | |
| 597 if (!ChargerReplacementDialog::ShouldShowDialog()) | |
| 598 return false; | |
| 599 | |
| 600 ChargerReplacementDialog* dialog = | |
| 601 new ChargerReplacementDialog(GetNativeWindow()); | |
| 602 dialog->Show(); | |
| 603 return true; | |
| 604 } | |
| 605 | |
| 606 bool SystemTrayDelegateChromeOS::IsSpringChargerReplacementDialogVisible() { | |
| 607 return ChargerReplacementDialog::IsDialogVisible(); | |
| 608 } | |
| 609 | |
| 610 bool SystemTrayDelegateChromeOS::HasUserConfirmedSafeSpringCharger() { | |
| 611 return ChargerReplacementHandler::GetChargerStatusPref() == | |
| 612 ChargerReplacementHandler::CONFIRM_SAFE_CHARGER; | |
| 613 } | |
| 614 | |
| 615 void SystemTrayDelegateChromeOS::ShutDown() { | 594 void SystemTrayDelegateChromeOS::ShutDown() { |
| 616 ash::Shell::GetInstance()->lock_state_controller()->RequestShutdown(); | 595 ash::Shell::GetInstance()->lock_state_controller()->RequestShutdown(); |
| 617 } | 596 } |
| 618 | 597 |
| 619 void SystemTrayDelegateChromeOS::SignOut() { | 598 void SystemTrayDelegateChromeOS::SignOut() { |
| 620 chrome::AttemptUserExit(); | 599 chrome::AttemptUserExit(); |
| 621 } | 600 } |
| 622 | 601 |
| 623 void SystemTrayDelegateChromeOS::RequestLockScreen() { | 602 void SystemTrayDelegateChromeOS::RequestLockScreen() { |
| 624 // TODO(antrim) : additional logging for crbug/173178 | 603 // TODO(antrim) : additional logging for crbug/173178 |
| (...skipping 686 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1311 accessibility_subscription_.reset(); | 1290 accessibility_subscription_.reset(); |
| 1312 else | 1291 else |
| 1313 OnAccessibilityModeChanged(details.notify); | 1292 OnAccessibilityModeChanged(details.notify); |
| 1314 } | 1293 } |
| 1315 | 1294 |
| 1316 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1295 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
| 1317 return new SystemTrayDelegateChromeOS(); | 1296 return new SystemTrayDelegateChromeOS(); |
| 1318 } | 1297 } |
| 1319 | 1298 |
| 1320 } // namespace chromeos | 1299 } // namespace chromeos |
| OLD | NEW |