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

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

Issue 2192613002: Moves NewWindowDelegate to ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: order Created 4 years, 4 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
« no previous file with comments | « ash/mus/new_window_delegate_mus.cc ('k') | ash/new_window_delegate.h » ('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/pointer_watcher_delegate.h" 11 #include "ash/common/pointer_watcher_delegate.h"
12 #include "ash/common/session/session_state_delegate.h" 12 #include "ash/common/session/session_state_delegate.h"
13 #include "ash/common/system/tray/default_system_tray_delegate.h" 13 #include "ash/common/system/tray/default_system_tray_delegate.h"
14 #include "ash/mus/accessibility_delegate_mus.h" 14 #include "ash/mus/accessibility_delegate_mus.h"
15 #include "ash/mus/new_window_delegate_mus.h"
15 #include "base/memory/ptr_util.h" 16 #include "base/memory/ptr_util.h"
16 #include "base/strings/string16.h" 17 #include "base/strings/string16.h"
17 #include "components/user_manager/user_info_impl.h" 18 #include "components/user_manager/user_info_impl.h"
18 #include "ui/app_list/presenter/app_list_presenter.h" 19 #include "ui/app_list/presenter/app_list_presenter.h"
19 #include "ui/gfx/image/image.h" 20 #include "ui/gfx/image/image.h"
20 21
21 namespace ash { 22 namespace ash {
22 namespace { 23 namespace {
23 24
24 class SessionStateDelegateStub : public SessionStateDelegate { 25 class SessionStateDelegateStub : public SessionStateDelegate {
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 SessionStateDelegate* ShellDelegateMus::CreateSessionStateDelegate() { 181 SessionStateDelegate* ShellDelegateMus::CreateSessionStateDelegate() {
181 NOTIMPLEMENTED() << " Using a stub SessionStateDeleagte implementation"; 182 NOTIMPLEMENTED() << " Using a stub SessionStateDeleagte implementation";
182 return new SessionStateDelegateStub; 183 return new SessionStateDelegateStub;
183 } 184 }
184 185
185 AccessibilityDelegate* ShellDelegateMus::CreateAccessibilityDelegate() { 186 AccessibilityDelegate* ShellDelegateMus::CreateAccessibilityDelegate() {
186 return new AccessibilityDelegateMus(connector_); 187 return new AccessibilityDelegateMus(connector_);
187 } 188 }
188 189
189 NewWindowDelegate* ShellDelegateMus::CreateNewWindowDelegate() { 190 NewWindowDelegate* ShellDelegateMus::CreateNewWindowDelegate() {
190 NOTIMPLEMENTED(); 191 return new mus::NewWindowDelegateMus;
191 return nullptr;
192 } 192 }
193 193
194 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() { 194 MediaDelegate* ShellDelegateMus::CreateMediaDelegate() {
195 NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation"; 195 NOTIMPLEMENTED() << " Using a stub MediaDelegate implementation";
196 return new MediaDelegateStub; 196 return new MediaDelegateStub;
197 } 197 }
198 198
199 std::unique_ptr<PointerWatcherDelegate> 199 std::unique_ptr<PointerWatcherDelegate>
200 ShellDelegateMus::CreatePointerWatcherDelegate() { 200 ShellDelegateMus::CreatePointerWatcherDelegate() {
201 NOTIMPLEMENTED(); 201 NOTIMPLEMENTED();
(...skipping 15 matching lines...) Expand all
217 NOTIMPLEMENTED(); 217 NOTIMPLEMENTED();
218 return base::string16(); 218 return base::string16();
219 } 219 }
220 220
221 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { 221 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const {
222 NOTIMPLEMENTED(); 222 NOTIMPLEMENTED();
223 return gfx::Image(); 223 return gfx::Image();
224 } 224 }
225 225
226 } // namespace ash 226 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/new_window_delegate_mus.cc ('k') | ash/new_window_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698