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

Side by Side Diff: ash/shell.cc

Issue 802473003: Fix references to ui/gfx headers in a*/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years 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/shell.h ('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 9
10 #include "ash/accelerators/accelerator_controller.h" 10 #include "ash/accelerators/accelerator_controller.h"
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 #include "ui/aura/client/aura_constants.h" 83 #include "ui/aura/client/aura_constants.h"
84 #include "ui/aura/env.h" 84 #include "ui/aura/env.h"
85 #include "ui/aura/layout_manager.h" 85 #include "ui/aura/layout_manager.h"
86 #include "ui/aura/window.h" 86 #include "ui/aura/window.h"
87 #include "ui/aura/window_event_dispatcher.h" 87 #include "ui/aura/window_event_dispatcher.h"
88 #include "ui/base/ui_base_switches.h" 88 #include "ui/base/ui_base_switches.h"
89 #include "ui/compositor/layer.h" 89 #include "ui/compositor/layer.h"
90 #include "ui/compositor/layer_animator.h" 90 #include "ui/compositor/layer_animator.h"
91 #include "ui/events/event_target_iterator.h" 91 #include "ui/events/event_target_iterator.h"
92 #include "ui/gfx/display.h" 92 #include "ui/gfx/display.h"
93 #include "ui/gfx/geometry/size.h"
93 #include "ui/gfx/image/image_skia.h" 94 #include "ui/gfx/image/image_skia.h"
94 #include "ui/gfx/screen.h" 95 #include "ui/gfx/screen.h"
95 #include "ui/gfx/size.h"
96 #include "ui/keyboard/keyboard.h" 96 #include "ui/keyboard/keyboard.h"
97 #include "ui/keyboard/keyboard_controller.h" 97 #include "ui/keyboard/keyboard_controller.h"
98 #include "ui/keyboard/keyboard_switches.h" 98 #include "ui/keyboard/keyboard_switches.h"
99 #include "ui/keyboard/keyboard_util.h" 99 #include "ui/keyboard/keyboard_util.h"
100 #include "ui/message_center/message_center.h" 100 #include "ui/message_center/message_center.h"
101 #include "ui/views/corewm/tooltip_aura.h" 101 #include "ui/views/corewm/tooltip_aura.h"
102 #include "ui/views/corewm/tooltip_controller.h" 102 #include "ui/views/corewm/tooltip_controller.h"
103 #include "ui/views/focus/focus_manager_factory.h" 103 #include "ui/views/focus/focus_manager_factory.h"
104 #include "ui/views/widget/native_widget_aura.h" 104 #include "ui/views/widget/native_widget_aura.h"
105 #include "ui/views/widget/widget.h" 105 #include "ui/views/widget/widget.h"
(...skipping 1052 matching lines...) Expand 10 before | Expand all | Expand 10 after
1158 //////////////////////////////////////////////////////////////////////////////// 1158 ////////////////////////////////////////////////////////////////////////////////
1159 // Shell, aura::client::ActivationChangeObserver implementation: 1159 // Shell, aura::client::ActivationChangeObserver implementation:
1160 1160
1161 void Shell::OnWindowActivated(aura::Window* gained_active, 1161 void Shell::OnWindowActivated(aura::Window* gained_active,
1162 aura::Window* lost_active) { 1162 aura::Window* lost_active) {
1163 if (gained_active) 1163 if (gained_active)
1164 target_root_window_ = gained_active->GetRootWindow(); 1164 target_root_window_ = gained_active->GetRootWindow();
1165 } 1165 }
1166 1166
1167 } // namespace ash 1167 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell.h ('k') | ash/shell_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698