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

Side by Side Diff: ash/shell.cc

Issue 2293183002: ash: Remove ash::Shelf in favor of ash::WmShelf (Closed)
Patch Set: rebase again Created 4 years, 3 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/shell.h ('k') | ash/shell/window_watcher.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/shell.h" 5 #include "ash/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 10
11 #include "ash/accelerators/accelerator_controller_delegate_aura.h" 11 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
12 #include "ash/accelerators/accelerator_delegate.h" 12 #include "ash/accelerators/accelerator_delegate.h"
13 #include "ash/aura/wm_shell_aura.h" 13 #include "ash/aura/wm_shell_aura.h"
14 #include "ash/aura/wm_window_aura.h" 14 #include "ash/aura/wm_window_aura.h"
15 #include "ash/autoclick/autoclick_controller.h" 15 #include "ash/autoclick/autoclick_controller.h"
16 #include "ash/common/accelerators/accelerator_controller.h" 16 #include "ash/common/accelerators/accelerator_controller.h"
17 #include "ash/common/ash_switches.h" 17 #include "ash/common/ash_switches.h"
18 #include "ash/common/frame/custom_frame_view_ash.h" 18 #include "ash/common/frame/custom_frame_view_ash.h"
19 #include "ash/common/gpu_support.h" 19 #include "ash/common/gpu_support.h"
20 #include "ash/common/keyboard/keyboard_ui.h" 20 #include "ash/common/keyboard/keyboard_ui.h"
21 #include "ash/common/login_status.h" 21 #include "ash/common/login_status.h"
22 #include "ash/common/session/session_state_delegate.h" 22 #include "ash/common/session/session_state_delegate.h"
23 #include "ash/common/shelf/app_list_shelf_item_delegate.h" 23 #include "ash/common/shelf/app_list_shelf_item_delegate.h"
24 #include "ash/common/shelf/shelf.h"
25 #include "ash/common/shelf/shelf_delegate.h" 24 #include "ash/common/shelf/shelf_delegate.h"
26 #include "ash/common/shelf/shelf_item_delegate.h" 25 #include "ash/common/shelf/shelf_item_delegate.h"
27 #include "ash/common/shelf/shelf_model.h" 26 #include "ash/common/shelf/shelf_model.h"
28 #include "ash/common/shelf/shelf_widget.h" 27 #include "ash/common/shelf/shelf_widget.h"
29 #include "ash/common/shell_delegate.h" 28 #include "ash/common/shell_delegate.h"
30 #include "ash/common/shell_window_ids.h" 29 #include "ash/common/shell_window_ids.h"
31 #include "ash/common/system/locale/locale_notification_controller.h" 30 #include "ash/common/system/locale/locale_notification_controller.h"
32 #include "ash/common/system/status_area_widget.h" 31 #include "ash/common/system/status_area_widget.h"
33 #include "ash/common/system/tray/system_tray_delegate.h" 32 #include "ash/common/system/tray/system_tray_delegate.h"
34 #include "ash/common/wallpaper/wallpaper_delegate.h" 33 #include "ash/common/wallpaper/wallpaper_delegate.h"
(...skipping 1000 matching lines...) Expand 10 before | Expand all | Expand 10 after
1035 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { 1034 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const {
1036 return std::unique_ptr<ui::EventTargetIterator>(); 1035 return std::unique_ptr<ui::EventTargetIterator>();
1037 } 1036 }
1038 1037
1039 ui::EventTargeter* Shell::GetEventTargeter() { 1038 ui::EventTargeter* Shell::GetEventTargeter() {
1040 NOTREACHED(); 1039 NOTREACHED();
1041 return nullptr; 1040 return nullptr;
1042 } 1041 }
1043 1042
1044 } // namespace ash 1043 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.h ('k') | ash/shell/window_watcher.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698