| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 "ash/sysui/shell_delegate_mus.h" | 5 #include "ash/sysui/shell_delegate_mus.h" |
| 6 | 6 |
| 7 #include "ash/default_accessibility_delegate.h" | 7 #include "ash/common/default_accessibility_delegate.h" |
| 8 #include "ash/gpu_support_stub.h" | 8 #include "ash/common/gpu_support_stub.h" |
| 9 #include "ash/media_delegate.h" | 9 #include "ash/common/media_delegate.h" |
| 10 #include "ash/session/session_state_delegate.h" | 10 #include "ash/common/session/session_state_delegate.h" |
| 11 #include "ash/system/tray/default_system_tray_delegate.h" | 11 #include "ash/system/tray/default_system_tray_delegate.h" |
| 12 #include "ash/sysui/app_list_presenter_mus.h" | 12 #include "ash/sysui/app_list_presenter_mus.h" |
| 13 #include "ash/sysui/container_delegate_mus.h" | 13 #include "ash/sysui/container_delegate_mus.h" |
| 14 #include "ash/sysui/context_menu_mus.h" | 14 #include "ash/sysui/context_menu_mus.h" |
| 15 #include "ash/sysui/pointer_watcher_delegate_mus.h" | 15 #include "ash/sysui/pointer_watcher_delegate_mus.h" |
| 16 #include "ash/sysui/shelf_delegate_mus.h" | 16 #include "ash/sysui/shelf_delegate_mus.h" |
| 17 #include "ash/sysui/user_wallpaper_delegate_mus.h" | 17 #include "ash/sysui/user_wallpaper_delegate_mus.h" |
| 18 #include "base/memory/ptr_util.h" | 18 #include "base/memory/ptr_util.h" |
| 19 #include "base/strings/string16.h" | 19 #include "base/strings/string16.h" |
| 20 #include "components/user_manager/user_info_impl.h" | 20 #include "components/user_manager/user_info_impl.h" |
| (...skipping 211 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 232 return base::string16(); | 232 return base::string16(); |
| 233 } | 233 } |
| 234 | 234 |
| 235 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { | 235 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { |
| 236 NOTIMPLEMENTED(); | 236 NOTIMPLEMENTED(); |
| 237 return gfx::Image(); | 237 return gfx::Image(); |
| 238 } | 238 } |
| 239 | 239 |
| 240 } // namespace sysui | 240 } // namespace sysui |
| 241 } // namespace ash | 241 } // namespace ash |
| OLD | NEW |