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

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

Issue 2734733002: Revert "chromeos: Move files in //ash/common to //ash, part 3" (Closed)
Patch Set: Created 3 years, 9 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/shell_delegate_mus.h ('k') | ash/mus/test/ash_test_impl_mus.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/gpu_support_stub.h" 9 #include "ash/common/gpu_support_stub.h"
10 #include "ash/common/palette_delegate.h"
11 #include "ash/common/session/session_state_delegate.h"
12 #include "ash/common/wm_shell.h"
10 #include "ash/mus/accessibility_delegate_mus.h" 13 #include "ash/mus/accessibility_delegate_mus.h"
11 #include "ash/mus/context_menu_mus.h" 14 #include "ash/mus/context_menu_mus.h"
12 #include "ash/mus/shelf_delegate_mus.h" 15 #include "ash/mus/shelf_delegate_mus.h"
13 #include "ash/mus/system_tray_delegate_mus.h" 16 #include "ash/mus/system_tray_delegate_mus.h"
14 #include "ash/mus/wallpaper_delegate_mus.h" 17 #include "ash/mus/wallpaper_delegate_mus.h"
15 #include "ash/palette_delegate.h"
16 #include "ash/session/session_state_delegate.h"
17 #include "ash/wm_shell.h"
18 #include "base/memory/ptr_util.h" 18 #include "base/memory/ptr_util.h"
19 #include "base/strings/string16.h" 19 #include "base/strings/string16.h"
20 #include "base/strings/string_util.h" 20 #include "base/strings/string_util.h"
21 #include "components/user_manager/user_info_impl.h" 21 #include "components/user_manager/user_info_impl.h"
22 #include "ui/gfx/image/image.h" 22 #include "ui/gfx/image/image.h"
23 23
24 namespace ash { 24 namespace ash {
25 namespace { 25 namespace {
26 26
27 class SessionStateDelegateStub : public SessionStateDelegate { 27 class SessionStateDelegateStub : public SessionStateDelegate {
(...skipping 168 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 void ShellDelegateMus::SetTouchscreenEnabledInPrefs(bool enabled, 196 void ShellDelegateMus::SetTouchscreenEnabledInPrefs(bool enabled,
197 bool use_local_state) { 197 bool use_local_state) {
198 NOTIMPLEMENTED(); 198 NOTIMPLEMENTED();
199 } 199 }
200 200
201 void ShellDelegateMus::UpdateTouchscreenStatusFromPrefs() { 201 void ShellDelegateMus::UpdateTouchscreenStatusFromPrefs() {
202 NOTIMPLEMENTED(); 202 NOTIMPLEMENTED();
203 } 203 }
204 204
205 } // namespace ash 205 } // namespace ash
OLDNEW
« no previous file with comments | « ash/mus/shell_delegate_mus.h ('k') | ash/mus/test/ash_test_impl_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698