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

Side by Side Diff: ash/root_window_controller.cc

Issue 2098023002: mash: Migrate remaining tray observers and notify functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and 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/common/wm_shell.cc ('k') | ash/shell.h » ('j') | ash/shell.h » ('J')
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/root_window_controller.h" 5 #include "ash/root_window_controller.h"
6 6
7 #include <queue> 7 #include <queue>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/aura/aura_layout_manager_adapter.h" 10 #include "ash/aura/aura_layout_manager_adapter.h"
(...skipping 26 matching lines...) Expand all
37 #include "ash/display/display_manager.h" 37 #include "ash/display/display_manager.h"
38 #include "ash/high_contrast/high_contrast_controller.h" 38 #include "ash/high_contrast/high_contrast_controller.h"
39 #include "ash/host/ash_window_tree_host.h" 39 #include "ash/host/ash_window_tree_host.h"
40 #include "ash/root_window_settings.h" 40 #include "ash/root_window_settings.h"
41 #include "ash/shelf/shelf_layout_manager.h" 41 #include "ash/shelf/shelf_layout_manager.h"
42 #include "ash/shelf/shelf_widget.h" 42 #include "ash/shelf/shelf_widget.h"
43 #include "ash/shell.h" 43 #include "ash/shell.h"
44 #include "ash/shell_delegate.h" 44 #include "ash/shell_delegate.h"
45 #include "ash/shell_factory.h" 45 #include "ash/shell_factory.h"
46 #include "ash/system/status_area_widget.h" 46 #include "ash/system/status_area_widget.h"
47 #include "ash/system/tray/system_tray_notifier.h"
48 #include "ash/touch/touch_hud_debug.h" 47 #include "ash/touch/touch_hud_debug.h"
49 #include "ash/touch/touch_hud_projection.h" 48 #include "ash/touch/touch_hud_projection.h"
50 #include "ash/touch/touch_observer_hud.h" 49 #include "ash/touch/touch_observer_hud.h"
51 #include "ash/wm/lock_layout_manager.h" 50 #include "ash/wm/lock_layout_manager.h"
52 #include "ash/wm/panels/attached_panel_window_targeter.h" 51 #include "ash/wm/panels/attached_panel_window_targeter.h"
53 #include "ash/wm/panels/panel_window_event_handler.h" 52 #include "ash/wm/panels/panel_window_event_handler.h"
54 #include "ash/wm/stacking_controller.h" 53 #include "ash/wm/stacking_controller.h"
55 #include "ash/wm/status_area_layout_manager.h" 54 #include "ash/wm/status_area_layout_manager.h"
56 #include "ash/wm/system_background_controller.h" 55 #include "ash/wm/system_background_controller.h"
57 #include "ash/wm/system_modal_container_layout_manager.h" 56 #include "ash/wm/system_modal_container_layout_manager.h"
(...skipping 920 matching lines...) Expand 10 before | Expand all | Expand 10 after
978 aura::Window* primary_root_window = Shell::GetInstance() 977 aura::Window* primary_root_window = Shell::GetInstance()
979 ->window_tree_host_manager() 978 ->window_tree_host_manager()
980 ->GetPrimaryRootWindow(); 979 ->GetPrimaryRootWindow();
981 return GetRootWindowSettings(primary_root_window)->controller; 980 return GetRootWindowSettings(primary_root_window)->controller;
982 } 981 }
983 982
984 return GetRootWindowSettings(root_window)->controller; 983 return GetRootWindowSettings(root_window)->controller;
985 } 984 }
986 985
987 } // namespace ash 986 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/wm_shell.cc ('k') | ash/shell.h » ('j') | ash/shell.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698