| 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 | 8 |
| 9 #include "ash/ash_switches.h" | 9 #include "ash/ash_switches.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 #include "chrome/browser/chromeos/input_method/input_method_util.h" | 50 #include "chrome/browser/chromeos/input_method/input_method_util.h" |
| 51 #include "chrome/browser/chromeos/input_method/xkeyboard.h" | 51 #include "chrome/browser/chromeos/input_method/xkeyboard.h" |
| 52 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" | 52 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" |
| 53 #include "chrome/browser/chromeos/login/base_login_display_host.h" | 53 #include "chrome/browser/chromeos/login/base_login_display_host.h" |
| 54 #include "chrome/browser/chromeos/login/help_app_launcher.h" | 54 #include "chrome/browser/chromeos/login/help_app_launcher.h" |
| 55 #include "chrome/browser/chromeos/login/login_display_host.h" | 55 #include "chrome/browser/chromeos/login/login_display_host.h" |
| 56 #include "chrome/browser/chromeos/login/message_bubble.h" | 56 #include "chrome/browser/chromeos/login/message_bubble.h" |
| 57 #include "chrome/browser/chromeos/login/user.h" | 57 #include "chrome/browser/chromeos/login/user.h" |
| 58 #include "chrome/browser/chromeos/login/user_manager.h" | 58 #include "chrome/browser/chromeos/login/user_manager.h" |
| 59 #include "chrome/browser/chromeos/mobile_config.h" | 59 #include "chrome/browser/chromeos/mobile_config.h" |
| 60 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" |
| 60 #include "chrome/browser/chromeos/status/data_promo_notification.h" | 61 #include "chrome/browser/chromeos/status/data_promo_notification.h" |
| 61 #include "chrome/browser/chromeos/status/network_menu.h" | 62 #include "chrome/browser/chromeos/status/network_menu.h" |
| 62 #include "chrome/browser/chromeos/status/network_menu_icon.h" | 63 #include "chrome/browser/chromeos/status/network_menu_icon.h" |
| 63 #include "chrome/browser/chromeos/system/timezone_settings.h" | 64 #include "chrome/browser/chromeos/system/timezone_settings.h" |
| 64 #include "chrome/browser/chromeos/system_key_event_listener.h" | 65 #include "chrome/browser/chromeos/system_key_event_listener.h" |
| 65 #include "chrome/browser/google/google_util.h" | 66 #include "chrome/browser/google/google_util.h" |
| 66 #include "chrome/browser/google_apis/drive_service_interface.h" | 67 #include "chrome/browser/google_apis/drive_service_interface.h" |
| 67 #include "chrome/browser/lifetime/application_lifetime.h" | 68 #include "chrome/browser/lifetime/application_lifetime.h" |
| 68 #include "chrome/browser/policy/browser_policy_connector.h" | 69 #include "chrome/browser/policy/browser_policy_connector.h" |
| 69 #include "chrome/browser/policy/cloud_policy_store.h" | 70 #include "chrome/browser/policy/cloud/cloud_policy_store.h" |
| 70 #include "chrome/browser/policy/device_cloud_policy_manager_chromeos.h" | |
| 71 #include "chrome/browser/prefs/pref_service.h" | 71 #include "chrome/browser/prefs/pref_service.h" |
| 72 #include "chrome/browser/profiles/profile_manager.h" | 72 #include "chrome/browser/profiles/profile_manager.h" |
| 73 #include "chrome/browser/ui/ash/volume_controller_chromeos.h" | 73 #include "chrome/browser/ui/ash/volume_controller_chromeos.h" |
| 74 #include "chrome/browser/ui/browser.h" | 74 #include "chrome/browser/ui/browser.h" |
| 75 #include "chrome/browser/ui/browser_finder.h" | 75 #include "chrome/browser/ui/browser_finder.h" |
| 76 #include "chrome/browser/ui/chrome_pages.h" | 76 #include "chrome/browser/ui/chrome_pages.h" |
| 77 #include "chrome/browser/ui/host_desktop.h" | 77 #include "chrome/browser/ui/host_desktop.h" |
| 78 #include "chrome/browser/ui/singleton_tabs.h" | 78 #include "chrome/browser/ui/singleton_tabs.h" |
| 79 #include "chrome/browser/upgrade_detector.h" | 79 #include "chrome/browser/upgrade_detector.h" |
| 80 #include "chrome/common/chrome_notification_types.h" | 80 #include "chrome/common/chrome_notification_types.h" |
| (...skipping 1344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1425 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); | 1425 DISALLOW_COPY_AND_ASSIGN(SystemTrayDelegate); |
| 1426 }; | 1426 }; |
| 1427 | 1427 |
| 1428 } // namespace | 1428 } // namespace |
| 1429 | 1429 |
| 1430 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1430 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
| 1431 return new chromeos::SystemTrayDelegate(); | 1431 return new chromeos::SystemTrayDelegate(); |
| 1432 } | 1432 } |
| 1433 | 1433 |
| 1434 } // namespace chromeos | 1434 } // namespace chromeos |
| OLD | NEW |