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

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

Issue 2434463004: mash: Move directly linked NewWindowDelegate to mojom::NewWindowClient. (Closed)
Patch Set: Rebase to ToT Created 4 years, 1 month 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
« no previous file with comments | « ash/mus/shell_delegate_mus.h ('k') | ash/mus/test/wm_test_helper.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 SessionStateDelegate* ShellDelegateMus::CreateSessionStateDelegate() { 191 SessionStateDelegate* ShellDelegateMus::CreateSessionStateDelegate() {
193 // TODO: http://crbug.com/647416. 192 // TODO: http://crbug.com/647416.
194 NOTIMPLEMENTED() << " Using a stub SessionStateDeleagte implementation"; 193 NOTIMPLEMENTED() << " Using a stub SessionStateDeleagte implementation";
195 return new SessionStateDelegateStub; 194 return new SessionStateDelegateStub;
196 } 195 }
197 196
198 AccessibilityDelegate* ShellDelegateMus::CreateAccessibilityDelegate() { 197 AccessibilityDelegate* ShellDelegateMus::CreateAccessibilityDelegate() {
199 return new AccessibilityDelegateMus(connector_); 198 return new AccessibilityDelegateMus(connector_);
200 } 199 }
201 200
202 NewWindowDelegate* ShellDelegateMus::CreateNewWindowDelegate() {
203 return new mus::NewWindowDelegateMus;
204 }
205
206 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() { 201 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() {
207 // TODO: http://crbug.com/647409. 202 // TODO: http://crbug.com/647409.
208 NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation"; 203 NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation";
209 return new MediaDelegateStub; 204 return new MediaDelegateStub;
210 } 205 }
211 206
212 std::unique_ptr<PaletteDelegate> ShellDelegateMus::CreatePaletteDelegate() { 207 std::unique_ptr<PaletteDelegate> ShellDelegateMus::CreatePaletteDelegate() {
213 // TODO: http://crbug.com/647417. 208 // TODO: http://crbug.com/647417.
214 NOTIMPLEMENTED(); 209 NOTIMPLEMENTED();
215 return nullptr; 210 return nullptr;
(...skipping 14 matching lines...) Expand all
230 NOTIMPLEMENTED(); 225 NOTIMPLEMENTED();
231 return base::string16(); 226 return base::string16();
232 } 227 }
233 228
234 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { 229 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const {
235 NOTIMPLEMENTED(); 230 NOTIMPLEMENTED();
236 return gfx::Image(); 231 return gfx::Image();
237 } 232 }
238 233
239 } // namespace ash 234 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/shell_delegate_mus.h ('k') | ash/mus/test/wm_test_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698