| 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 65 #include "chrome/browser/chromeos/login/user_adding_screen.h" | 65 #include "chrome/browser/chromeos/login/user_adding_screen.h" |
| 66 #include "chrome/browser/chromeos/login/user_manager.h" | 66 #include "chrome/browser/chromeos/login/user_manager.h" |
| 67 #include "chrome/browser/chromeos/net/network_portal_detector.h" | 67 #include "chrome/browser/chromeos/net/network_portal_detector.h" |
| 68 #include "chrome/browser/chromeos/options/network_config_view.h" | 68 #include "chrome/browser/chromeos/options/network_config_view.h" |
| 69 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" | 69 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h" |
| 70 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" | 70 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h" |
| 71 #include "chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.h" | 71 #include "chrome/browser/chromeos/profiles/multiprofiles_intro_dialog.h" |
| 72 #include "chrome/browser/chromeos/settings/cros_settings.h" | 72 #include "chrome/browser/chromeos/settings/cros_settings.h" |
| 73 #include "chrome/browser/chromeos/sim_dialog_delegate.h" | 73 #include "chrome/browser/chromeos/sim_dialog_delegate.h" |
| 74 #include "chrome/browser/drive/drive_service_interface.h" | 74 #include "chrome/browser/drive/drive_service_interface.h" |
| 75 #include "chrome/browser/feedback/tracing_manager.h" | |
| 76 #include "chrome/browser/google/google_util.h" | 75 #include "chrome/browser/google/google_util.h" |
| 77 #include "chrome/browser/lifetime/application_lifetime.h" | 76 #include "chrome/browser/lifetime/application_lifetime.h" |
| 78 #include "chrome/browser/profiles/profile_manager.h" | 77 #include "chrome/browser/profiles/profile_manager.h" |
| 79 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" | 78 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" |
| 80 #include "chrome/browser/ui/ash/volume_controller_chromeos.h" | 79 #include "chrome/browser/ui/ash/volume_controller_chromeos.h" |
| 81 #include "chrome/browser/ui/browser.h" | 80 #include "chrome/browser/ui/browser.h" |
| 82 #include "chrome/browser/ui/browser_finder.h" | 81 #include "chrome/browser/ui/browser_finder.h" |
| 83 #include "chrome/browser/ui/browser_list.h" | 82 #include "chrome/browser/ui/browser_list.h" |
| 84 #include "chrome/browser/ui/chrome_pages.h" | 83 #include "chrome/browser/ui/chrome_pages.h" |
| 85 #include "chrome/browser/ui/host_desktop.h" | 84 #include "chrome/browser/ui/host_desktop.h" |
| 86 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" | 85 #include "chrome/browser/ui/scoped_tabbed_browser_displayer.h" |
| 87 #include "chrome/browser/ui/singleton_tabs.h" | 86 #include "chrome/browser/ui/singleton_tabs.h" |
| 88 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 87 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 89 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h" | 88 #include "chrome/browser/ui/webui/chromeos/charger_replacement_handler.h" |
| 90 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h" | 89 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h" |
| 91 #include "chrome/browser/upgrade_detector.h" | 90 #include "chrome/browser/upgrade_detector.h" |
| 92 #include "chrome/common/chrome_switches.h" | 91 #include "chrome/common/chrome_switches.h" |
| 93 #include "chrome/common/pref_names.h" | 92 #include "chrome/common/pref_names.h" |
| 94 #include "chrome/common/url_constants.h" | 93 #include "chrome/common/url_constants.h" |
| 95 #include "chromeos/dbus/dbus_thread_manager.h" | 94 #include "chromeos/dbus/dbus_thread_manager.h" |
| 96 #include "chromeos/dbus/session_manager_client.h" | 95 #include "chromeos/dbus/session_manager_client.h" |
| 97 #include "chromeos/ime/extension_ime_util.h" | 96 #include "chromeos/ime/extension_ime_util.h" |
| 98 #include "chromeos/ime/input_method_manager.h" | 97 #include "chromeos/ime/input_method_manager.h" |
| 99 #include "chromeos/ime/xkeyboard.h" | 98 #include "chromeos/ime/xkeyboard.h" |
| 100 #include "chromeos/login/login_state.h" | 99 #include "chromeos/login/login_state.h" |
| 100 #include "components/feedback/tracing_manager.h" |
| 101 #include "components/policy/core/common/cloud/cloud_policy_store.h" | 101 #include "components/policy/core/common/cloud/cloud_policy_store.h" |
| 102 #include "content/public/browser/notification_observer.h" | 102 #include "content/public/browser/notification_observer.h" |
| 103 #include "content/public/browser/notification_service.h" | 103 #include "content/public/browser/notification_service.h" |
| 104 #include "content/public/browser/user_metrics.h" | 104 #include "content/public/browser/user_metrics.h" |
| 105 #include "content/public/browser/web_contents.h" | 105 #include "content/public/browser/web_contents.h" |
| 106 #include "device/bluetooth/bluetooth_adapter.h" | 106 #include "device/bluetooth/bluetooth_adapter.h" |
| 107 #include "device/bluetooth/bluetooth_adapter_factory.h" | 107 #include "device/bluetooth/bluetooth_adapter_factory.h" |
| 108 #include "device/bluetooth/bluetooth_device.h" | 108 #include "device/bluetooth/bluetooth_device.h" |
| 109 #include "grit/ash_strings.h" | 109 #include "grit/ash_strings.h" |
| 110 #include "grit/generated_resources.h" | 110 #include "grit/generated_resources.h" |
| (...skipping 1287 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1398 accessibility_subscription_.reset(); | 1398 accessibility_subscription_.reset(); |
| 1399 else | 1399 else |
| 1400 OnAccessibilityModeChanged(details.notify); | 1400 OnAccessibilityModeChanged(details.notify); |
| 1401 } | 1401 } |
| 1402 | 1402 |
| 1403 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1403 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
| 1404 return new SystemTrayDelegateChromeOS(); | 1404 return new SystemTrayDelegateChromeOS(); |
| 1405 } | 1405 } |
| 1406 | 1406 |
| 1407 } // namespace chromeos | 1407 } // namespace chromeos |
| OLD | NEW |