| 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/mus/shell_delegate_mus.h" | 5 #include "ash/mus/shell_delegate_mus.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "ash/common/gpu_support_stub.h" | 9 #include "ash/common/gpu_support_stub.h" |
| 10 #include "ash/common/media_delegate.h" | 10 #include "ash/common/media_delegate.h" |
| (...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 169 app_list::AppListPresenter* ShellDelegateMus::GetAppListPresenter() { | 169 app_list::AppListPresenter* ShellDelegateMus::GetAppListPresenter() { |
| 170 return &app_list_presenter_; | 170 return &app_list_presenter_; |
| 171 } | 171 } |
| 172 | 172 |
| 173 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) { | 173 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) { |
| 174 return new ShelfDelegateMus(WmShell::Get()->shelf_model()); | 174 return new ShelfDelegateMus(WmShell::Get()->shelf_model()); |
| 175 } | 175 } |
| 176 | 176 |
| 177 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() { | 177 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() { |
| 178 #if defined(OS_CHROMEOS) | 178 #if defined(OS_CHROMEOS) |
| 179 return new SystemTrayDelegateMus(connector_); | 179 return new SystemTrayDelegateMus(); |
| 180 #else | 180 #else |
| 181 // Windows and Linux do not support the services required for most system tray | 181 // Windows and Linux do not support the services required for most system tray |
| 182 // items. Use the same stub delegate as ash_shell_with_content. | 182 // items. Use the same stub delegate as ash_shell_with_content. |
| 183 return new DefaultSystemTrayDelegate(); | 183 return new DefaultSystemTrayDelegate(); |
| 184 #endif | 184 #endif |
| 185 } | 185 } |
| 186 | 186 |
| 187 std::unique_ptr<WallpaperDelegate> ShellDelegateMus::CreateWallpaperDelegate() { | 187 std::unique_ptr<WallpaperDelegate> ShellDelegateMus::CreateWallpaperDelegate() { |
| 188 return base::MakeUnique<WallpaperDelegateMus>(connector_); | 188 return base::MakeUnique<WallpaperDelegateMus>(connector_); |
| 189 } | 189 } |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 229 NOTIMPLEMENTED(); | 229 NOTIMPLEMENTED(); |
| 230 return base::string16(); | 230 return base::string16(); |
| 231 } | 231 } |
| 232 | 232 |
| 233 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { | 233 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { |
| 234 NOTIMPLEMENTED(); | 234 NOTIMPLEMENTED(); |
| 235 return gfx::Image(); | 235 return gfx::Image(); |
| 236 } | 236 } |
| 237 | 237 |
| 238 } // namespace ash | 238 } // namespace ash |
| OLD | NEW |