Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(918)

Side by Side Diff: ash/mus/shell_delegate_mus.cc

Issue 2434463004: mash: Move directly linked NewWindowDelegate to mojom::NewWindowClient. (Closed)
Patch Set: Actually rename the browser test. Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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"
11 #include "ash/common/palette_delegate.h" 11 #include "ash/common/palette_delegate.h"
12 #include "ash/common/session/session_state_delegate.h" 12 #include "ash/common/session/session_state_delegate.h"
13 #include "ash/common/wm_shell.h" 13 #include "ash/common/wm_shell.h"
14 #include "ash/mus/accessibility_delegate_mus.h" 14 #include "ash/mus/accessibility_delegate_mus.h"
15 #include "ash/mus/context_menu_mus.h" 15 #include "ash/mus/context_menu_mus.h"
16 #include "ash/mus/new_window_delegate_mus.h"
17 #include "ash/mus/shelf_delegate_mus.h" 16 #include "ash/mus/shelf_delegate_mus.h"
18 #include "ash/mus/wallpaper_delegate_mus.h" 17 #include "ash/mus/wallpaper_delegate_mus.h"
19 #include "base/memory/ptr_util.h" 18 #include "base/memory/ptr_util.h"
20 #include "base/strings/string16.h" 19 #include "base/strings/string16.h"
21 #include "base/strings/string_util.h" 20 #include "base/strings/string_util.h"
22 #include "components/user_manager/user_info_impl.h" 21 #include "components/user_manager/user_info_impl.h"
23 #include "ui/app_list/presenter/app_list_presenter.h" 22 #include "ui/app_list/presenter/app_list_presenter.h"
24 #include "ui/gfx/image/image.h" 23 #include "ui/gfx/image/image.h"
25 24
26 #if defined(OS_CHROMEOS) 25 #if defined(OS_CHROMEOS)
(...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 SessionStateDelegate* ShellDelegateMus::CreateSessionStateDelegate() { 196 SessionStateDelegate* ShellDelegateMus::CreateSessionStateDelegate() {
198 // TODO: http://crbug.com/647416. 197 // TODO: http://crbug.com/647416.
199 NOTIMPLEMENTED() << " Using a stub SessionStateDeleagte implementation"; 198 NOTIMPLEMENTED() << " Using a stub SessionStateDeleagte implementation";
200 return new SessionStateDelegateStub; 199 return new SessionStateDelegateStub;
201 } 200 }
202 201
203 AccessibilityDelegate* ShellDelegateMus::CreateAccessibilityDelegate() { 202 AccessibilityDelegate* ShellDelegateMus::CreateAccessibilityDelegate() {
204 return new AccessibilityDelegateMus(connector_); 203 return new AccessibilityDelegateMus(connector_);
205 } 204 }
206 205
207 NewWindowDelegate* ShellDelegateMus::CreateNewWindowDelegate() {
208 return new mus::NewWindowDelegateMus;
209 }
210
211 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() { 206 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() {
212 // TODO: http://crbug.com/647409. 207 // TODO: http://crbug.com/647409.
213 NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation"; 208 NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation";
214 return new MediaDelegateStub; 209 return new MediaDelegateStub;
215 } 210 }
216 211
217 std::unique_ptr<PaletteDelegate> ShellDelegateMus::CreatePaletteDelegate() { 212 std::unique_ptr<PaletteDelegate> ShellDelegateMus::CreatePaletteDelegate() {
218 // TODO: http://crbug.com/647417. 213 // TODO: http://crbug.com/647417.
219 NOTIMPLEMENTED(); 214 NOTIMPLEMENTED();
220 return nullptr; 215 return nullptr;
(...skipping 14 matching lines...) Expand all
235 NOTIMPLEMENTED(); 230 NOTIMPLEMENTED();
236 return base::string16(); 231 return base::string16();
237 } 232 }
238 233
239 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { 234 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const {
240 NOTIMPLEMENTED(); 235 NOTIMPLEMENTED();
241 return gfx::Image(); 236 return gfx::Image();
242 } 237 }
243 238
244 } // namespace ash 239 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698