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

Side by Side Diff: ash/shell.cc

Issue 9463003: aura-x11: Add custom web cursor support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: sort headers. Created 8 years, 8 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 | Annotate | Revision Log
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 8
9 #include "ash/app_list/app_list.h" 9 #include "ash/app_list/app_list.h"
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
11 #include "ash/desktop_background/desktop_background_controller.h" 11 #include "ash/desktop_background/desktop_background_controller.h"
12 #include "ash/desktop_background/desktop_background_resources.h" 12 #include "ash/desktop_background/desktop_background_resources.h"
13 #include "ash/desktop_background/desktop_background_view.h" 13 #include "ash/desktop_background/desktop_background_view.h"
14 #include "ash/drag_drop/drag_drop_controller.h" 14 #include "ash/drag_drop/drag_drop_controller.h"
15 #include "ash/focus_cycler.h" 15 #include "ash/focus_cycler.h"
16 #include "ash/ime/input_method_event_filter.h" 16 #include "ash/ime/input_method_event_filter.h"
17 #include "ash/launcher/launcher.h" 17 #include "ash/launcher/launcher.h"
18 #include "ash/monitor/monitor_controller.h"
18 #include "ash/monitor/multi_monitor_manager.h" 19 #include "ash/monitor/multi_monitor_manager.h"
19 #include "ash/monitor/monitor_controller.h"
20 #include "ash/screen_ash.h" 20 #include "ash/screen_ash.h"
21 #include "ash/shell_delegate.h" 21 #include "ash/shell_delegate.h"
22 #include "ash/shell_factory.h" 22 #include "ash/shell_factory.h"
23 #include "ash/shell_window_ids.h" 23 #include "ash/shell_window_ids.h"
24 #include "ash/system/audio/tray_volume.h" 24 #include "ash/system/audio/tray_volume.h"
25 #include "ash/system/bluetooth/tray_bluetooth.h" 25 #include "ash/system/bluetooth/tray_bluetooth.h"
26 #include "ash/system/brightness/tray_brightness.h" 26 #include "ash/system/brightness/tray_brightness.h"
27 #include "ash/system/date/tray_date.h" 27 #include "ash/system/date/tray_date.h"
28 #include "ash/system/ime/tray_ime.h" 28 #include "ash/system/ime/tray_ime.h"
29 #include "ash/system/network/tray_network.h" 29 #include "ash/system/network/tray_network.h"
30 #include "ash/system/power/power_status_observer.h" 30 #include "ash/system/power/power_status_observer.h"
31 #include "ash/system/power/power_supply_status.h" 31 #include "ash/system/power/power_supply_status.h"
32 #include "ash/system/power/tray_power.h" 32 #include "ash/system/power/tray_power.h"
33 #include "ash/system/settings/tray_settings.h" 33 #include "ash/system/settings/tray_settings.h"
34 #include "ash/system/tray/system_tray.h"
34 #include "ash/system/tray/system_tray_delegate.h" 35 #include "ash/system/tray/system_tray_delegate.h"
35 #include "ash/system/tray/system_tray.h"
36 #include "ash/system/tray/tray_empty.h" 36 #include "ash/system/tray/tray_empty.h"
37 #include "ash/system/tray_accessibility.h" 37 #include "ash/system/tray_accessibility.h"
38 #include "ash/system/tray_caps_lock.h" 38 #include "ash/system/tray_caps_lock.h"
39 #include "ash/system/user/tray_user.h" 39 #include "ash/system/user/tray_user.h"
40 #include "ash/tooltips/tooltip_controller.h" 40 #include "ash/tooltips/tooltip_controller.h"
41 #include "ash/wm/activation_controller.h" 41 #include "ash/wm/activation_controller.h"
42 #include "ash/wm/base_layout_manager.h" 42 #include "ash/wm/base_layout_manager.h"
43 #include "ash/wm/custom_frame_view_ash.h" 43 #include "ash/wm/custom_frame_view_ash.h"
44 #include "ash/wm/dialog_frame_view.h" 44 #include "ash/wm/dialog_frame_view.h"
45 #include "ash/wm/event_client_impl.h" 45 #include "ash/wm/event_client_impl.h"
46 #include "ash/wm/key_rewriter_event_filter.h" 46 #include "ash/wm/key_rewriter_event_filter.h"
47 #include "ash/wm/panel_layout_manager.h"
47 #include "ash/wm/panel_window_event_filter.h" 48 #include "ash/wm/panel_window_event_filter.h"
48 #include "ash/wm/panel_layout_manager.h"
49 #include "ash/wm/partial_screenshot_event_filter.h" 49 #include "ash/wm/partial_screenshot_event_filter.h"
50 #include "ash/wm/power_button_controller.h" 50 #include "ash/wm/power_button_controller.h"
51 #include "ash/wm/resize_shadow_controller.h" 51 #include "ash/wm/resize_shadow_controller.h"
52 #include "ash/wm/root_window_event_filter.h" 52 #include "ash/wm/root_window_event_filter.h"
53 #include "ash/wm/root_window_layout_manager.h" 53 #include "ash/wm/root_window_layout_manager.h"
54 #include "ash/wm/shadow_controller.h" 54 #include "ash/wm/shadow_controller.h"
55 #include "ash/wm/shelf_layout_manager.h" 55 #include "ash/wm/shelf_layout_manager.h"
56 #include "ash/wm/stacking_controller.h" 56 #include "ash/wm/stacking_controller.h"
57 #include "ash/wm/status_area_layout_manager.h" 57 #include "ash/wm/status_area_layout_manager.h"
58 #include "ash/wm/system_modal_container_layout_manager.h" 58 #include "ash/wm/system_modal_container_layout_manager.h"
59 #include "ash/wm/toplevel_window_event_filter.h" 59 #include "ash/wm/toplevel_window_event_filter.h"
60 #include "ash/wm/video_detector.h" 60 #include "ash/wm/video_detector.h"
61 #include "ash/wm/visibility_controller.h" 61 #include "ash/wm/visibility_controller.h"
62 #include "ash/wm/window_cycle_controller.h" 62 #include "ash/wm/window_cycle_controller.h"
63 #include "ash/wm/window_modality_controller.h" 63 #include "ash/wm/window_modality_controller.h"
64 #include "ash/wm/window_util.h" 64 #include "ash/wm/window_util.h"
65 #include "ash/wm/workspace/always_on_top_layout_manager.h" 65 #include "ash/wm/workspace/always_on_top_layout_manager.h"
66 #include "ash/wm/workspace_controller.h"
67 #include "ash/wm/workspace/workspace_event_filter.h" 66 #include "ash/wm/workspace/workspace_event_filter.h"
68 #include "ash/wm/workspace/workspace_layout_manager.h" 67 #include "ash/wm/workspace/workspace_layout_manager.h"
69 #include "ash/wm/workspace/workspace_manager.h" 68 #include "ash/wm/workspace/workspace_manager.h"
69 #include "ash/wm/workspace_controller.h"
70 #include "base/bind.h" 70 #include "base/bind.h"
71 #include "base/command_line.h" 71 #include "base/command_line.h"
72 #include "grit/ui_resources.h" 72 #include "grit/ui_resources.h"
73 #include "third_party/skia/include/core/SkBitmap.h" 73 #include "third_party/skia/include/core/SkBitmap.h"
74 #include "ui/aura/client/aura_constants.h" 74 #include "ui/aura/client/aura_constants.h"
75 #include "ui/aura/env.h" 75 #include "ui/aura/env.h"
76 #include "ui/aura/layout_manager.h" 76 #include "ui/aura/layout_manager.h"
77 #include "ui/aura/monitor.h" 77 #include "ui/aura/monitor.h"
78 #include "ui/aura/monitor_manager.h" 78 #include "ui/aura/monitor_manager.h"
79 #include "ui/aura/monitor_manager.h" 79 #include "ui/aura/monitor_manager.h"
(...skipping 557 matching lines...) Expand 10 before | Expand all | Expand 10 after
637 // order) since they have the second highest priority. 637 // order) since they have the second highest priority.
638 DCHECK_EQ(2U, GetRootWindowEventFilterCount()); 638 DCHECK_EQ(2U, GetRootWindowEventFilterCount());
639 #if !defined(OS_MACOSX) 639 #if !defined(OS_MACOSX)
640 accelerator_filter_.reset(new internal::AcceleratorFilter); 640 accelerator_filter_.reset(new internal::AcceleratorFilter);
641 AddRootWindowEventFilter(accelerator_filter_.get()); 641 AddRootWindowEventFilter(accelerator_filter_.get());
642 DCHECK_EQ(3U, GetRootWindowEventFilterCount()); 642 DCHECK_EQ(3U, GetRootWindowEventFilterCount());
643 #endif 643 #endif
644 input_method_filter_.reset(new internal::InputMethodEventFilter); 644 input_method_filter_.reset(new internal::InputMethodEventFilter);
645 AddRootWindowEventFilter(input_method_filter_.get()); 645 AddRootWindowEventFilter(input_method_filter_.get());
646 646
647 root_window->SetCursor(aura::kCursorPointer); 647 root_window->SetCursor(ui::kCursorPointer);
648 if (initially_hide_cursor_) 648 if (initially_hide_cursor_)
649 root_window->ShowCursor(false); 649 root_window->ShowCursor(false);
650 650
651 activation_controller_.reset(new internal::ActivationController); 651 activation_controller_.reset(new internal::ActivationController);
652 652
653 CreateSpecialContainers(root_window); 653 CreateSpecialContainers(root_window);
654 654
655 stacking_controller_.reset(new internal::StackingController); 655 stacking_controller_.reset(new internal::StackingController);
656 656
657 root_window_layout_ = new internal::RootWindowLayoutManager(root_window); 657 root_window_layout_ = new internal::RootWindowLayoutManager(root_window);
(...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after
912 desktop_background_controller_->SetDesktopBackgroundImageMode( 912 desktop_background_controller_->SetDesktopBackgroundImageMode(
913 GetWallpaper(index), GetWallpaperInfo(index).layout); 913 GetWallpaper(index), GetWallpaperInfo(index).layout);
914 } 914 }
915 915
916 void Shell::DisableWorkspaceGridLayout() { 916 void Shell::DisableWorkspaceGridLayout() {
917 if (workspace_controller_.get()) 917 if (workspace_controller_.get())
918 workspace_controller_->workspace_manager()->set_grid_size(0); 918 workspace_controller_->workspace_manager()->set_grid_size(0);
919 } 919 }
920 920
921 } // namespace ash 921 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698