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

Side by Side Diff: ash/shell.cc

Issue 2625843002: Folds WmRootWindowController into RootWindowController (Closed)
Patch Set: definition in wm_root_window_controller.cc 2 Created 3 years, 11 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/shelf/shelf_widget_unittest.cc ('k') | ash/shell_unittest.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
(...skipping 23 matching lines...) Expand all
34 #include "ash/common/system/tray/system_tray_delegate.h" 34 #include "ash/common/system/tray/system_tray_delegate.h"
35 #include "ash/common/wallpaper/wallpaper_delegate.h" 35 #include "ash/common/wallpaper/wallpaper_delegate.h"
36 #include "ash/common/wm/container_finder.h" 36 #include "ash/common/wm/container_finder.h"
37 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h" 37 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
38 #include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h" 38 #include "ash/common/wm/maximize_mode/maximize_mode_window_manager.h"
39 #include "ash/common/wm/mru_window_tracker.h" 39 #include "ash/common/wm/mru_window_tracker.h"
40 #include "ash/common/wm/root_window_finder.h" 40 #include "ash/common/wm/root_window_finder.h"
41 #include "ash/common/wm/system_modal_container_layout_manager.h" 41 #include "ash/common/wm/system_modal_container_layout_manager.h"
42 #include "ash/common/wm/window_positioner.h" 42 #include "ash/common/wm/window_positioner.h"
43 #include "ash/common/wm/workspace_controller.h" 43 #include "ash/common/wm/workspace_controller.h"
44 #include "ash/common/wm_root_window_controller.h"
45 #include "ash/common/wm_shell.h" 44 #include "ash/common/wm_shell.h"
46 #include "ash/display/cursor_window_controller.h" 45 #include "ash/display/cursor_window_controller.h"
47 #include "ash/display/display_color_manager_chromeos.h" 46 #include "ash/display/display_color_manager_chromeos.h"
48 #include "ash/display/display_configuration_controller.h" 47 #include "ash/display/display_configuration_controller.h"
49 #include "ash/display/display_error_observer_chromeos.h" 48 #include "ash/display/display_error_observer_chromeos.h"
50 #include "ash/display/event_transformation_handler.h" 49 #include "ash/display/event_transformation_handler.h"
51 #include "ash/display/mouse_cursor_event_filter.h" 50 #include "ash/display/mouse_cursor_event_filter.h"
52 #include "ash/display/projecting_observer_chromeos.h" 51 #include "ash/display/projecting_observer_chromeos.h"
53 #include "ash/display/resolution_notification_controller.h" 52 #include "ash/display/resolution_notification_controller.h"
54 #include "ash/display/screen_ash.h" 53 #include "ash/display/screen_ash.h"
(...skipping 800 matching lines...) Expand 10 before | Expand all | Expand 10 after
855 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const { 854 std::unique_ptr<ui::EventTargetIterator> Shell::GetChildIterator() const {
856 return std::unique_ptr<ui::EventTargetIterator>(); 855 return std::unique_ptr<ui::EventTargetIterator>();
857 } 856 }
858 857
859 ui::EventTargeter* Shell::GetEventTargeter() { 858 ui::EventTargeter* Shell::GetEventTargeter() {
860 NOTREACHED(); 859 NOTREACHED();
861 return nullptr; 860 return nullptr;
862 } 861 }
863 862
864 } // namespace ash 863 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_widget_unittest.cc ('k') | ash/shell_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698