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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: ash/shell.cc

Issue 194843004: Move files from ui/views/corewm to ui/wm/core (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 9 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
« no previous file with comments | « ash/shell.h ('k') | ash/shell/content_client/shell_browser_main_parts.cc » ('j') | ui/views/DEPS » ('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/shell.h" 5 #include "ash/shell.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "ash/accelerators/accelerator_controller.h" 10 #include "ash/accelerators/accelerator_controller.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 #include "ui/events/event_target_iterator.h" 94 #include "ui/events/event_target_iterator.h"
95 #include "ui/gfx/display.h" 95 #include "ui/gfx/display.h"
96 #include "ui/gfx/image/image_skia.h" 96 #include "ui/gfx/image/image_skia.h"
97 #include "ui/gfx/screen.h" 97 #include "ui/gfx/screen.h"
98 #include "ui/gfx/size.h" 98 #include "ui/gfx/size.h"
99 #include "ui/keyboard/keyboard.h" 99 #include "ui/keyboard/keyboard.h"
100 #include "ui/keyboard/keyboard_controller.h" 100 #include "ui/keyboard/keyboard_controller.h"
101 #include "ui/keyboard/keyboard_switches.h" 101 #include "ui/keyboard/keyboard_switches.h"
102 #include "ui/keyboard/keyboard_util.h" 102 #include "ui/keyboard/keyboard_util.h"
103 #include "ui/message_center/message_center.h" 103 #include "ui/message_center/message_center.h"
104 #include "ui/views/corewm/compound_event_filter.h"
105 #include "ui/views/corewm/corewm_switches.h"
106 #include "ui/views/corewm/focus_controller.h"
107 #include "ui/views/corewm/input_method_event_filter.h"
108 #include "ui/views/corewm/shadow_controller.h"
109 #include "ui/views/corewm/tooltip_aura.h" 104 #include "ui/views/corewm/tooltip_aura.h"
110 #include "ui/views/corewm/tooltip_controller.h" 105 #include "ui/views/corewm/tooltip_controller.h"
111 #include "ui/views/corewm/visibility_controller.h"
112 #include "ui/views/corewm/window_modality_controller.h"
113 #include "ui/views/focus/focus_manager_factory.h" 106 #include "ui/views/focus/focus_manager_factory.h"
114 #include "ui/views/widget/native_widget_aura.h" 107 #include "ui/views/widget/native_widget_aura.h"
115 #include "ui/views/widget/widget.h" 108 #include "ui/views/widget/widget.h"
109 #include "ui/wm/core/compound_event_filter.h"
110 #include "ui/wm/core/focus_controller.h"
111 #include "ui/wm/core/input_method_event_filter.h"
112 #include "ui/wm/core/shadow_controller.h"
113 #include "ui/wm/core/visibility_controller.h"
114 #include "ui/wm/core/window_modality_controller.h"
116 115
117 #if defined(OS_CHROMEOS) 116 #if defined(OS_CHROMEOS)
118 #if defined(USE_X11) 117 #if defined(USE_X11)
119 #include "ash/accelerators/magnifier_key_scroller.h" 118 #include "ash/accelerators/magnifier_key_scroller.h"
120 #include "ash/accelerators/spoken_feedback_toggler.h" 119 #include "ash/accelerators/spoken_feedback_toggler.h"
121 #include "ash/ash_constants.h" 120 #include "ash/ash_constants.h"
122 #include "ash/display/display_change_observer_chromeos.h" 121 #include "ash/display/display_change_observer_chromeos.h"
123 #include "ash/display/display_error_observer_chromeos.h" 122 #include "ash/display/display_error_observer_chromeos.h"
124 #include "ash/display/output_configurator_animation.h" 123 #include "ash/display/output_configurator_animation.h"
125 #include "ash/display/projecting_observer_chromeos.h" 124 #include "ash/display/projecting_observer_chromeos.h"
(...skipping 977 matching lines...) Expand 10 before | Expand all | Expand 10 after
1103 //////////////////////////////////////////////////////////////////////////////// 1102 ////////////////////////////////////////////////////////////////////////////////
1104 // Shell, aura::client::ActivationChangeObserver implementation: 1103 // Shell, aura::client::ActivationChangeObserver implementation:
1105 1104
1106 void Shell::OnWindowActivated(aura::Window* gained_active, 1105 void Shell::OnWindowActivated(aura::Window* gained_active,
1107 aura::Window* lost_active) { 1106 aura::Window* lost_active) {
1108 if (gained_active) 1107 if (gained_active)
1109 target_root_window_ = gained_active->GetRootWindow(); 1108 target_root_window_ = gained_active->GetRootWindow();
1110 } 1109 }
1111 1110
1112 } // namespace ash 1111 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.h ('k') | ash/shell/content_client/shell_browser_main_parts.cc » ('j') | ui/views/DEPS » ('J')

Powered by Google App Engine
This is Rietveld 408576698