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

Side by Side Diff: ash/test/ui_controls_factory_ash.cc

Issue 174803002: Move root_window.* to window_event_dispatcher.* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 10 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/test/display_manager_test_api.cc ('k') | ash/tooltips/tooltip_controller_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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 #include "ash/shell_factory.h" 6 #include "ash/shell_factory.h"
7 #include "ash/wm/coordinate_conversion.h" 7 #include "ash/wm/coordinate_conversion.h"
8 #include "ash/wm/window_properties.h" 8 #include "ash/wm/window_properties.h"
9 #include "ui/aura/client/capture_client.h" 9 #include "ui/aura/client/capture_client.h"
10 #include "ui/aura/client/screen_position_client.h" 10 #include "ui/aura/client/screen_position_client.h"
11 #include "ui/aura/env.h" 11 #include "ui/aura/env.h"
12 #include "ui/aura/root_window.h"
13 #include "ui/aura/test/ui_controls_factory_aura.h" 12 #include "ui/aura/test/ui_controls_factory_aura.h"
13 #include "ui/aura/window_event_dispatcher.h"
14 #include "ui/aura/window_property.h" 14 #include "ui/aura/window_property.h"
15 #include "ui/base/test/ui_controls.h" 15 #include "ui/base/test/ui_controls.h"
16 #include "ui/base/test/ui_controls_aura.h" 16 #include "ui/base/test/ui_controls_aura.h"
17 #include "ui/gfx/screen.h" 17 #include "ui/gfx/screen.h"
18 18
19 DECLARE_WINDOW_PROPERTY_TYPE(ui_controls::UIControlsAura*) 19 DECLARE_WINDOW_PROPERTY_TYPE(ui_controls::UIControlsAura*)
20 20
21 namespace ash { 21 namespace ash {
22 namespace test { 22 namespace test {
23 namespace { 23 namespace {
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 private: 130 private:
131 DISALLOW_COPY_AND_ASSIGN(UIControlsAsh); 131 DISALLOW_COPY_AND_ASSIGN(UIControlsAsh);
132 }; 132 };
133 133
134 ui_controls::UIControlsAura* CreateAshUIControls() { 134 ui_controls::UIControlsAura* CreateAshUIControls() {
135 return new ash::test::UIControlsAsh(); 135 return new ash::test::UIControlsAsh();
136 } 136 }
137 137
138 } // namespace test 138 } // namespace test
139 } // namespace ash 139 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/display_manager_test_api.cc ('k') | ash/tooltips/tooltip_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698