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

Side by Side Diff: ash/shell.cc

Issue 2046513003: mash: Move shelf model and item classes to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@initshelfearly
Patch Set: 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/shelf/shelf_window_watcher_unittest.cc ('k') | ash/shell/window_watcher.h » ('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.h" 11 #include "ash/accelerators/accelerator_controller.h"
12 #include "ash/accelerators/accelerator_delegate.h" 12 #include "ash/accelerators/accelerator_delegate.h"
13 #include "ash/accelerators/focus_manager_factory.h" 13 #include "ash/accelerators/focus_manager_factory.h"
14 #include "ash/ash_switches.h" 14 #include "ash/ash_switches.h"
15 #include "ash/aura/wm_shell_aura.h" 15 #include "ash/aura/wm_shell_aura.h"
16 #include "ash/aura/wm_window_aura.h" 16 #include "ash/aura/wm_window_aura.h"
17 #include "ash/autoclick/autoclick_controller.h" 17 #include "ash/autoclick/autoclick_controller.h"
18 #include "ash/common/shelf/shelf_item_delegate.h"
19 #include "ash/common/shelf/shelf_item_delegate_manager.h"
20 #include "ash/common/shelf/shelf_model.h"
18 #include "ash/common/shell_window_ids.h" 21 #include "ash/common/shell_window_ids.h"
19 #include "ash/common/wm/root_window_finder.h" 22 #include "ash/common/wm/root_window_finder.h"
20 #include "ash/common/wm/window_positioner.h" 23 #include "ash/common/wm/window_positioner.h"
21 #include "ash/container_delegate.h" 24 #include "ash/container_delegate.h"
22 #include "ash/desktop_background/desktop_background_controller.h" 25 #include "ash/desktop_background/desktop_background_controller.h"
23 #include "ash/desktop_background/desktop_background_view.h" 26 #include "ash/desktop_background/desktop_background_view.h"
24 #include "ash/desktop_background/user_wallpaper_delegate.h" 27 #include "ash/desktop_background/user_wallpaper_delegate.h"
25 #include "ash/display/cursor_window_controller.h" 28 #include "ash/display/cursor_window_controller.h"
26 #include "ash/display/display_configuration_controller.h" 29 #include "ash/display/display_configuration_controller.h"
27 #include "ash/display/display_manager.h" 30 #include "ash/display/display_manager.h"
(...skipping 14 matching lines...) Expand all
42 #include "ash/magnifier/magnification_controller.h" 45 #include "ash/magnifier/magnification_controller.h"
43 #include "ash/magnifier/partial_magnification_controller.h" 46 #include "ash/magnifier/partial_magnification_controller.h"
44 #include "ash/media_delegate.h" 47 #include "ash/media_delegate.h"
45 #include "ash/new_window_delegate.h" 48 #include "ash/new_window_delegate.h"
46 #include "ash/pointer_watcher_delegate.h" 49 #include "ash/pointer_watcher_delegate.h"
47 #include "ash/root_window_controller.h" 50 #include "ash/root_window_controller.h"
48 #include "ash/session/session_state_delegate.h" 51 #include "ash/session/session_state_delegate.h"
49 #include "ash/shelf/app_list_shelf_item_delegate.h" 52 #include "ash/shelf/app_list_shelf_item_delegate.h"
50 #include "ash/shelf/shelf.h" 53 #include "ash/shelf/shelf.h"
51 #include "ash/shelf/shelf_delegate.h" 54 #include "ash/shelf/shelf_delegate.h"
52 #include "ash/shelf/shelf_item_delegate.h"
53 #include "ash/shelf/shelf_item_delegate_manager.h"
54 #include "ash/shelf/shelf_model.h"
55 #include "ash/shelf/shelf_widget.h" 55 #include "ash/shelf/shelf_widget.h"
56 #include "ash/shelf/shelf_window_watcher.h" 56 #include "ash/shelf/shelf_window_watcher.h"
57 #include "ash/shell_delegate.h" 57 #include "ash/shell_delegate.h"
58 #include "ash/shell_factory.h" 58 #include "ash/shell_factory.h"
59 #include "ash/shell_init_params.h" 59 #include "ash/shell_init_params.h"
60 #include "ash/system/locale/locale_notification_controller.h" 60 #include "ash/system/locale/locale_notification_controller.h"
61 #include "ash/system/status_area_widget.h" 61 #include "ash/system/status_area_widget.h"
62 #include "ash/system/toast/toast_manager.h" 62 #include "ash/system/toast/toast_manager.h"
63 #include "ash/system/tray/system_tray_delegate.h" 63 #include "ash/system/tray/system_tray_delegate.h"
64 #include "ash/system/tray/system_tray_notifier.h" 64 #include "ash/system/tray/system_tray_notifier.h"
(...skipping 1184 matching lines...) Expand 10 before | Expand all | Expand 10 after
1249 1249
1250 void Shell::OnWindowActivated( 1250 void Shell::OnWindowActivated(
1251 aura::client::ActivationChangeObserver::ActivationReason reason, 1251 aura::client::ActivationChangeObserver::ActivationReason reason,
1252 aura::Window* gained_active, 1252 aura::Window* gained_active,
1253 aura::Window* lost_active) { 1253 aura::Window* lost_active) {
1254 if (gained_active) 1254 if (gained_active)
1255 target_root_window_ = gained_active->GetRootWindow(); 1255 target_root_window_ = gained_active->GetRootWindow();
1256 } 1256 }
1257 1257
1258 } // namespace ash 1258 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shelf/shelf_window_watcher_unittest.cc ('k') | ash/shell/window_watcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698