| 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 <set> | 10 #include <set> |
| (...skipping 14 matching lines...) Expand all Loading... |
| 25 #include "ash/common/system/date/clock_observer.h" | 25 #include "ash/common/system/date/clock_observer.h" |
| 26 #include "ash/common/system/ime/ime_observer.h" | 26 #include "ash/common/system/ime/ime_observer.h" |
| 27 #include "ash/common/system/tray/system_tray.h" | 27 #include "ash/common/system/tray/system_tray.h" |
| 28 #include "ash/common/system/tray/system_tray_delegate.h" | 28 #include "ash/common/system/tray/system_tray_delegate.h" |
| 29 #include "ash/common/system/tray/system_tray_notifier.h" | 29 #include "ash/common/system/tray/system_tray_notifier.h" |
| 30 #include "ash/common/system/tray_accessibility.h" | 30 #include "ash/common/system/tray_accessibility.h" |
| 31 #include "ash/common/system/update/update_observer.h" | 31 #include "ash/common/system/update/update_observer.h" |
| 32 #include "ash/common/system/user/user_observer.h" | 32 #include "ash/common/system/user/user_observer.h" |
| 33 #include "ash/common/system/volume_control_delegate.h" | 33 #include "ash/common/system/volume_control_delegate.h" |
| 34 #include "ash/common/wm_shell.h" | 34 #include "ash/common/wm_shell.h" |
| 35 #include "ash/desktop_background/desktop_background_controller.h" | |
| 36 #include "ash/shell.h" | 35 #include "ash/shell.h" |
| 37 #include "ash/system/chromeos/rotation/tray_rotation_lock.h" | 36 #include "ash/system/chromeos/rotation/tray_rotation_lock.h" |
| 38 #include "ash/system/chromeos/tray_display.h" | 37 #include "ash/system/chromeos/tray_display.h" |
| 39 #include "ash/wm/lock_state_controller.h" | 38 #include "ash/wm/lock_state_controller.h" |
| 40 #include "base/bind_helpers.h" | 39 #include "base/bind_helpers.h" |
| 41 #include "base/callback.h" | 40 #include "base/callback.h" |
| 42 #include "base/logging.h" | 41 #include "base/logging.h" |
| 43 #include "base/memory/ptr_util.h" | 42 #include "base/memory/ptr_util.h" |
| 44 #include "base/memory/weak_ptr.h" | 43 #include "base/memory/weak_ptr.h" |
| 45 #include "base/strings/stringprintf.h" | 44 #include "base/strings/stringprintf.h" |
| (...skipping 1282 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1328 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " | 1327 LOG(WARNING) << "SystemTrayDelegateChromeOS::GetChildUserMessage call while " |
| 1329 << "ENABLE_SUPERVISED_USERS undefined."; | 1328 << "ENABLE_SUPERVISED_USERS undefined."; |
| 1330 return base::string16(); | 1329 return base::string16(); |
| 1331 } | 1330 } |
| 1332 | 1331 |
| 1333 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { | 1332 ash::SystemTrayDelegate* CreateSystemTrayDelegate() { |
| 1334 return new SystemTrayDelegateChromeOS(); | 1333 return new SystemTrayDelegateChromeOS(); |
| 1335 } | 1334 } |
| 1336 | 1335 |
| 1337 } // namespace chromeos | 1336 } // namespace chromeos |
| OLD | NEW |