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

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

Issue 2041233004: mash: Move //ash/session to //ash/common/session (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 6 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/system/user/user_view.cc ('k') | ash/test/shell_test_api.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/sysui/shell_delegate_mus.h" 5 #include "ash/sysui/shell_delegate_mus.h"
6 6
7 #include "ash/common/default_accessibility_delegate.h" 7 #include "ash/common/default_accessibility_delegate.h"
8 #include "ash/common/session/session_state_delegate.h"
8 #include "ash/gpu_support_stub.h" 9 #include "ash/gpu_support_stub.h"
9 #include "ash/media_delegate.h" 10 #include "ash/media_delegate.h"
10 #include "ash/session/session_state_delegate.h"
11 #include "ash/system/tray/default_system_tray_delegate.h" 11 #include "ash/system/tray/default_system_tray_delegate.h"
12 #include "ash/sysui/app_list_presenter_mus.h" 12 #include "ash/sysui/app_list_presenter_mus.h"
13 #include "ash/sysui/container_delegate_mus.h" 13 #include "ash/sysui/container_delegate_mus.h"
14 #include "ash/sysui/context_menu_mus.h" 14 #include "ash/sysui/context_menu_mus.h"
15 #include "ash/sysui/pointer_watcher_delegate_mus.h" 15 #include "ash/sysui/pointer_watcher_delegate_mus.h"
16 #include "ash/sysui/shelf_delegate_mus.h" 16 #include "ash/sysui/shelf_delegate_mus.h"
17 #include "ash/sysui/user_wallpaper_delegate_mus.h" 17 #include "ash/sysui/user_wallpaper_delegate_mus.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 "components/user_manager/user_info_impl.h" 20 #include "components/user_manager/user_info_impl.h"
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 return base::string16(); 234 return base::string16();
235 } 235 }
236 236
237 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const { 237 gfx::Image ShellDelegateMus::GetDeprecatedAcceleratorImage() const {
238 NOTIMPLEMENTED(); 238 NOTIMPLEMENTED();
239 return gfx::Image(); 239 return gfx::Image();
240 } 240 }
241 241
242 } // namespace sysui 242 } // namespace sysui
243 } // namespace ash 243 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/user/user_view.cc ('k') | ash/test/shell_test_api.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698