| 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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 163 | 163 |
| 164 app_list::AppListPresenter* ShellDelegateMus::GetAppListPresenter() { | 164 app_list::AppListPresenter* ShellDelegateMus::GetAppListPresenter() { |
| 165 return &app_list_presenter_; | 165 return &app_list_presenter_; |
| 166 } | 166 } |
| 167 | 167 |
| 168 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) { | 168 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) { |
| 169 return new ShelfDelegateMus(WmShell::Get()->shelf_model()); | 169 return new ShelfDelegateMus(WmShell::Get()->shelf_model()); |
| 170 } | 170 } |
| 171 | 171 |
| 172 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() { | 172 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() { |
| 173 // TODO: http://crbug.com/647412. |
| 173 NOTIMPLEMENTED() << " Using the default SystemTrayDelegate implementation"; | 174 NOTIMPLEMENTED() << " Using the default SystemTrayDelegate implementation"; |
| 174 return new DefaultSystemTrayDelegate; | 175 return new DefaultSystemTrayDelegate; |
| 175 } | 176 } |
| 176 | 177 |
| 177 std::unique_ptr<WallpaperDelegate> ShellDelegateMus::CreateWallpaperDelegate() { | 178 std::unique_ptr<WallpaperDelegate> ShellDelegateMus::CreateWallpaperDelegate() { |
| 178 return base::MakeUnique<WallpaperDelegateMus>(connector_); | 179 return base::MakeUnique<WallpaperDelegateMus>(connector_); |
| 179 } | 180 } |
| 180 | 181 |
| 181 SessionStateDelegate* ShellDelegateMus::CreateSessionStateDelegate() { | 182 SessionStateDelegate* ShellDelegateMus::CreateSessionStateDelegate() { |
| 183 // TODO: http://crbug.com/647416. |
| 182 NOTIMPLEMENTED() << " Using a stub SessionStateDeleagte implementation"; | 184 NOTIMPLEMENTED() << " Using a stub SessionStateDeleagte implementation"; |
| 183 return new SessionStateDelegateStub; | 185 return new SessionStateDelegateStub; |
| 184 } | 186 } |
| 185 | 187 |
| 186 AccessibilityDelegate* ShellDelegateMus::CreateAccessibilityDelegate() { | 188 AccessibilityDelegate* ShellDelegateMus::CreateAccessibilityDelegate() { |
| 187 return new AccessibilityDelegateMus(connector_); | 189 return new AccessibilityDelegateMus(connector_); |
| 188 } | 190 } |
| 189 | 191 |
| 190 NewWindowDelegate* ShellDelegateMus::CreateNewWindowDelegate() { | 192 NewWindowDelegate* ShellDelegateMus::CreateNewWindowDelegate() { |
| 191 return new mus::NewWindowDelegateMus; | 193 return new mus::NewWindowDelegateMus; |
| 192 } | 194 } |
| 193 | 195 |
| 194 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() { | 196 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() { |
| 197 // TODO: http://crbug.com/647409. |
| 195 NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation"; | 198 NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation"; |
| 196 return new MediaDelegateStub; | 199 return new MediaDelegateStub; |
| 197 } | 200 } |
| 198 | 201 |
| 199 std::unique_ptr<PaletteDelegate> ShellDelegateMus::CreatePaletteDelegate() { | 202 std::unique_ptr<PaletteDelegate> ShellDelegateMus::CreatePaletteDelegate() { |
| 203 // TODO: http://crbug.com/647417. |
| 200 NOTIMPLEMENTED(); | 204 NOTIMPLEMENTED(); |
| 201 return nullptr; | 205 return nullptr; |
| 202 } | 206 } |
| 203 | 207 |
| 204 ui::MenuModel* ShellDelegateMus::CreateContextMenu(WmShelf* wm_shelf, | 208 ui::MenuModel* ShellDelegateMus::CreateContextMenu(WmShelf* wm_shelf, |
| 205 const ShelfItem* item) { | 209 const ShelfItem* item) { |
| 206 return new ContextMenuMus(wm_shelf); | 210 return new ContextMenuMus(wm_shelf); |
| 207 } | 211 } |
| 208 | 212 |
| 209 GPUSupport* ShellDelegateMus::CreateGPUSupport() { | 213 GPUSupport* ShellDelegateMus::CreateGPUSupport() { |
| 214 // TODO: http://crbug.com/647421. |
| 210 NOTIMPLEMENTED() << " Using a stub GPUSupport implementation"; | 215 NOTIMPLEMENTED() << " Using a stub GPUSupport implementation"; |
| 211 return new GPUSupportStub(); | 216 return new GPUSupportStub(); |
| 212 } | 217 } |
| 213 | 218 |
| 214 base::string16 ShellDelegateMus::GetProductName() const { | 219 base::string16 ShellDelegateMus::GetProductName() const { |
| 215 NOTIMPLEMENTED(); | 220 NOTIMPLEMENTED(); |
| 216 return base::string16(); | 221 return base::string16(); |
| 217 } | 222 } |
| 218 | 223 |
| 219 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { | 224 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { |
| 220 NOTIMPLEMENTED(); | 225 NOTIMPLEMENTED(); |
| 221 return gfx::Image(); | 226 return gfx::Image(); |
| 222 } | 227 } |
| 223 | 228 |
| 224 } // namespace ash | 229 } // namespace ash |
| OLD | NEW |