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

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

Issue 2900423002: [mus+ash] Removes WmWindow from ash/wm/root_window_finder.h (Closed)
Patch Set: Remove WmWindow from ash/wm/root_window_finder.h (tab drag test) Created 3 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/shell_port.cc ('k') | ash/wm/container_finder.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/wm/root_window_finder.h" 6 #include "ash/wm/root_window_finder.h"
7 #include "ash/wm/window_properties.h" 7 #include "ash/wm/window_properties.h"
8 #include "ash/wm_window.h"
9 #include "ui/aura/client/capture_client.h" 8 #include "ui/aura/client/capture_client.h"
10 #include "ui/aura/client/screen_position_client.h" 9 #include "ui/aura/client/screen_position_client.h"
11 #include "ui/aura/env.h" 10 #include "ui/aura/env.h"
12 #include "ui/aura/test/ui_controls_factory_aura.h" 11 #include "ui/aura/test/ui_controls_factory_aura.h"
13 #include "ui/aura/window_tree_host.h" 12 #include "ui/aura/window_tree_host.h"
14 #include "ui/base/class_property.h" 13 #include "ui/base/class_property.h"
15 #include "ui/base/test/ui_controls.h" 14 #include "ui/base/test/ui_controls.h"
16 #include "ui/base/test/ui_controls_aura.h" 15 #include "ui/base/test/ui_controls_aura.h"
17 #include "ui/display/screen.h" 16 #include "ui/display/screen.h"
18 17
(...skipping 18 matching lines...) Expand all
37 aura::test::CreateUIControlsAura(root_window->GetHost()); 36 aura::test::CreateUIControlsAura(root_window->GetHost());
38 // Pass the ownership to the |root_window|. 37 // Pass the ownership to the |root_window|.
39 root_window->SetProperty(kUIControlsKey, native_ui_control); 38 root_window->SetProperty(kUIControlsKey, native_ui_control);
40 } 39 }
41 return native_ui_control; 40 return native_ui_control;
42 } 41 }
43 42
44 // Returns the UIControls object for the RootWindow at |point_in_screen|. 43 // Returns the UIControls object for the RootWindow at |point_in_screen|.
45 UIControlsAura* GetUIControlsAt(const gfx::Point& point_in_screen) { 44 UIControlsAura* GetUIControlsAt(const gfx::Point& point_in_screen) {
46 // TODO(mazda): Support the case passive grab is taken. 45 // TODO(mazda): Support the case passive grab is taken.
47 return GetUIControlsForRootWindow( 46 return GetUIControlsForRootWindow(ash::wm::GetRootWindowAt(point_in_screen));
48 WmWindow::GetAuraWindow(ash::wm::GetRootWindowAt(point_in_screen)));
49 } 47 }
50 48
51 } // namespace 49 } // namespace
52 50
53 class UIControlsAsh : public UIControlsAura { 51 class UIControlsAsh : public UIControlsAura {
54 public: 52 public:
55 UIControlsAsh() {} 53 UIControlsAsh() {}
56 ~UIControlsAsh() override {} 54 ~UIControlsAsh() override {}
57 55
58 // UIControslAura overrides: 56 // UIControslAura overrides:
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 private: 126 private:
129 DISALLOW_COPY_AND_ASSIGN(UIControlsAsh); 127 DISALLOW_COPY_AND_ASSIGN(UIControlsAsh);
130 }; 128 };
131 129
132 ui_controls::UIControlsAura* CreateAshUIControls() { 130 ui_controls::UIControlsAura* CreateAshUIControls() {
133 return new ash::test::UIControlsAsh(); 131 return new ash::test::UIControlsAsh();
134 } 132 }
135 133
136 } // namespace test 134 } // namespace test
137 } // namespace ash 135 } // namespace ash
OLDNEW
« no previous file with comments | « ash/shell_port.cc ('k') | ash/wm/container_finder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698