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 <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include <algorithm> | 9 #include <algorithm> |
10 #include <memory> | 10 #include <memory> |
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
82 #include "content/public/browser/user_metrics.h" | 82 #include "content/public/browser/user_metrics.h" |
83 #include "device/bluetooth/bluetooth_adapter.h" | 83 #include "device/bluetooth/bluetooth_adapter.h" |
84 #include "device/bluetooth/bluetooth_adapter_factory.h" | 84 #include "device/bluetooth/bluetooth_adapter_factory.h" |
85 #include "device/bluetooth/bluetooth_device.h" | 85 #include "device/bluetooth/bluetooth_device.h" |
86 #include "ui/base/ime/chromeos/extension_ime_util.h" | 86 #include "ui/base/ime/chromeos/extension_ime_util.h" |
87 #include "ui/base/ime/chromeos/input_method_manager.h" | 87 #include "ui/base/ime/chromeos/input_method_manager.h" |
88 #include "ui/base/l10n/l10n_util.h" | 88 #include "ui/base/l10n/l10n_util.h" |
89 #include "ui/base/l10n/time_format.h" | 89 #include "ui/base/l10n/time_format.h" |
90 #include "ui/chromeos/ime/input_method_menu_item.h" | 90 #include "ui/chromeos/ime/input_method_menu_item.h" |
91 #include "ui/chromeos/ime/input_method_menu_manager.h" | 91 #include "ui/chromeos/ime/input_method_menu_manager.h" |
| 92 #include "ui/chromeos/pref_names.h" |
92 | 93 |
93 #if BUILDFLAG(ENABLE_SUPERVISED_USERS) | 94 #if BUILDFLAG(ENABLE_SUPERVISED_USERS) |
94 #include "chrome/browser/supervised_user/supervised_user_service.h" | 95 #include "chrome/browser/supervised_user/supervised_user_service.h" |
95 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" | 96 #include "chrome/browser/supervised_user/supervised_user_service_factory.h" |
96 #endif | 97 #endif |
97 | 98 |
98 namespace chromeos { | 99 namespace chromeos { |
99 | 100 |
100 namespace { | 101 namespace { |
101 | 102 |
(...skipping 859 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
961 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " | 962 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " |
962 << "ENABLE_SUPERVISED_USERS undefined."; | 963 << "ENABLE_SUPERVISED_USERS undefined."; |
963 return base::string16(); | 964 return base::string16(); |
964 } | 965 } |
965 | 966 |
966 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 967 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
967 return new SystemTrayDelegateChromeOS(); | 968 return new SystemTrayDelegateChromeOS(); |
968 } | 969 } |
969 | 970 |
970 } // namespace chromeos | 971 } // namespace chromeos |
OLD | NEW |