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

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

Issue 2629643002: chromeos: Renames WmWindowAura to WmWindow (Closed)
Patch Set: feedback Created 3 years, 11 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/test/ash_test_impl_aura.cc ('k') | ash/test/wm_window_aura_test_api.h » ('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/aura/wm_window_aura.h"
6 #include "ash/common/wm/root_window_finder.h" 5 #include "ash/common/wm/root_window_finder.h"
6 #include "ash/common/wm_window.h"
7 #include "ash/shell.h" 7 #include "ash/shell.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/test/ui_controls_factory_aura.h" 12 #include "ui/aura/test/ui_controls_factory_aura.h"
13 #include "ui/aura/window_property.h" 13 #include "ui/aura/window_property.h"
14 #include "ui/aura/window_tree_host.h" 14 #include "ui/aura/window_tree_host.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"
(...skipping 21 matching lines...) Expand all
38 // Pass the ownership to the |root_window|. 38 // Pass the ownership to the |root_window|.
39 root_window->SetProperty(kUIControlsKey, native_ui_control); 39 root_window->SetProperty(kUIControlsKey, native_ui_control);
40 } 40 }
41 return native_ui_control; 41 return native_ui_control;
42 } 42 }
43 43
44 // Returns the UIControls object for the RootWindow at |point_in_screen|. 44 // Returns the UIControls object for the RootWindow at |point_in_screen|.
45 UIControlsAura* GetUIControlsAt(const gfx::Point& point_in_screen) { 45 UIControlsAura* GetUIControlsAt(const gfx::Point& point_in_screen) {
46 // TODO(mazda): Support the case passive grab is taken. 46 // TODO(mazda): Support the case passive grab is taken.
47 return GetUIControlsForRootWindow( 47 return GetUIControlsForRootWindow(
48 WmWindowAura::GetAuraWindow(ash::wm::GetRootWindowAt(point_in_screen))); 48 WmWindow::GetAuraWindow(ash::wm::GetRootWindowAt(point_in_screen)));
49 } 49 }
50 50
51 } // namespace 51 } // namespace
52 52
53 class UIControlsAsh : public UIControlsAura { 53 class UIControlsAsh : public UIControlsAura {
54 public: 54 public:
55 UIControlsAsh() {} 55 UIControlsAsh() {}
56 ~UIControlsAsh() override {} 56 ~UIControlsAsh() override {}
57 57
58 // UIControslAura overrides: 58 // UIControslAura overrides:
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 private: 128 private:
129 DISALLOW_COPY_AND_ASSIGN(UIControlsAsh); 129 DISALLOW_COPY_AND_ASSIGN(UIControlsAsh);
130 }; 130 };
131 131
132 ui_controls::UIControlsAura* CreateAshUIControls() { 132 ui_controls::UIControlsAura* CreateAshUIControls() {
133 return new ash::test::UIControlsAsh(); 133 return new ash::test::UIControlsAsh();
134 } 134 }
135 135
136 } // namespace test 136 } // namespace test
137 } // namespace ash 137 } // namespace ash
OLDNEW
« no previous file with comments | « ash/test/ash_test_impl_aura.cc ('k') | ash/test/wm_window_aura_test_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698