| 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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 NOTIMPLEMENTED(); | 96 NOTIMPLEMENTED(); |
| 97 return MEDIA_CAPTURE_NONE; | 97 return MEDIA_CAPTURE_NONE; |
| 98 } | 98 } |
| 99 | 99 |
| 100 private: | 100 private: |
| 101 DISALLOW_COPY_AND_ASSIGN(MediaDelegateStub); | 101 DISALLOW_COPY_AND_ASSIGN(MediaDelegateStub); |
| 102 }; | 102 }; |
| 103 | 103 |
| 104 } // namespace | 104 } // namespace |
| 105 | 105 |
| 106 ShellDelegateMus::ShellDelegateMus( | 106 ShellDelegateMus::ShellDelegateMus(shell::Connector* connector) |
| 107 std::unique_ptr<app_list::AppListPresenter> app_list_presenter, | 107 : connector_(connector), app_list_presenter_(connector) { |
| 108 shell::Connector* connector) | |
| 109 : app_list_presenter_(std::move(app_list_presenter)), | |
| 110 connector_(connector) { | |
| 111 // |connector_| may be null in tests. | 108 // |connector_| may be null in tests. |
| 112 } | 109 } |
| 113 | 110 |
| 114 ShellDelegateMus::~ShellDelegateMus() {} | 111 ShellDelegateMus::~ShellDelegateMus() {} |
| 115 | 112 |
| 116 bool ShellDelegateMus::IsFirstRunAfterBoot() const { | 113 bool ShellDelegateMus::IsFirstRunAfterBoot() const { |
| 117 NOTIMPLEMENTED(); | 114 NOTIMPLEMENTED(); |
| 118 return false; | 115 return false; |
| 119 } | 116 } |
| 120 | 117 |
| (...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 158 keyboard::KeyboardUI* ShellDelegateMus::CreateKeyboardUI() { | 155 keyboard::KeyboardUI* ShellDelegateMus::CreateKeyboardUI() { |
| 159 NOTIMPLEMENTED(); | 156 NOTIMPLEMENTED(); |
| 160 return nullptr; | 157 return nullptr; |
| 161 } | 158 } |
| 162 | 159 |
| 163 void ShellDelegateMus::OpenUrlFromArc(const GURL& url) { | 160 void ShellDelegateMus::OpenUrlFromArc(const GURL& url) { |
| 164 NOTIMPLEMENTED(); | 161 NOTIMPLEMENTED(); |
| 165 } | 162 } |
| 166 | 163 |
| 167 app_list::AppListPresenter* ShellDelegateMus::GetAppListPresenter() { | 164 app_list::AppListPresenter* ShellDelegateMus::GetAppListPresenter() { |
| 168 return app_list_presenter_.get(); | 165 return &app_list_presenter_; |
| 169 } | 166 } |
| 170 | 167 |
| 171 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) { | 168 ShelfDelegate* ShellDelegateMus::CreateShelfDelegate(ShelfModel* model) { |
| 172 return new ShelfDelegateMus(WmShell::Get()->shelf_model()); | 169 return new ShelfDelegateMus(WmShell::Get()->shelf_model()); |
| 173 } | 170 } |
| 174 | 171 |
| 175 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() { | 172 SystemTrayDelegate* ShellDelegateMus::CreateSystemTrayDelegate() { |
| 176 NOTIMPLEMENTED() << " Using the default SystemTrayDelegate implementation"; | 173 NOTIMPLEMENTED() << " Using the default SystemTrayDelegate implementation"; |
| 177 return new DefaultSystemTrayDelegate; | 174 return new DefaultSystemTrayDelegate; |
| 178 } | 175 } |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 218 NOTIMPLEMENTED(); | 215 NOTIMPLEMENTED(); |
| 219 return base::string16(); | 216 return base::string16(); |
| 220 } | 217 } |
| 221 | 218 |
| 222 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { | 219 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { |
| 223 NOTIMPLEMENTED(); | 220 NOTIMPLEMENTED(); |
| 224 return gfx::Image(); | 221 return gfx::Image(); |
| 225 } | 222 } |
| 226 | 223 |
| 227 } // namespace ash | 224 } // namespace ash |
| OLD | NEW |