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

Side by Side Diff: ui/aura/test/aura_test_base.h

Issue 2657873006: Remove WindowTreeClientDelegate::GetCaptureClient() and WindowTreeClient::GetCaptureClient(). (Closed)
Patch Set: Created 3 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
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 #ifndef UI_AURA_TEST_AURA_TEST_BASE_H_ 5 #ifndef UI_AURA_TEST_AURA_TEST_BASE_H_
6 #define UI_AURA_TEST_AURA_TEST_BASE_H_ 6 #define UI_AURA_TEST_AURA_TEST_BASE_H_
7 7
8 #include <memory> 8 #include <memory>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 ui::mojom::MoveLoopSource source, 118 ui::mojom::MoveLoopSource source,
119 const gfx::Point& cursor_location, 119 const gfx::Point& cursor_location,
120 const base::Callback<void(bool)>& on_done) override; 120 const base::Callback<void(bool)>& on_done) override;
121 void OnWmCancelMoveLoop(Window* window) override; 121 void OnWmCancelMoveLoop(Window* window) override;
122 void OnWmSetClientArea( 122 void OnWmSetClientArea(
123 Window* window, 123 Window* window,
124 const gfx::Insets& insets, 124 const gfx::Insets& insets,
125 const std::vector<gfx::Rect>& additional_client_areas) override; 125 const std::vector<gfx::Rect>& additional_client_areas) override;
126 bool IsWindowActive(aura::Window* window) override; 126 bool IsWindowActive(aura::Window* window) override;
127 void OnWmDeactivateWindow(Window* window) override; 127 void OnWmDeactivateWindow(Window* window) override;
128 client::CaptureClient* GetCaptureClient() override;
129 PropertyConverter* GetPropertyConverter() override; 128 PropertyConverter* GetPropertyConverter() override;
130 129
131 private: 130 private:
132 // Only used for mus. Both are are initialized to this, but may be reset. 131 // Only used for mus. Both are are initialized to this, but may be reset.
133 WindowManagerDelegate* window_manager_delegate_; 132 WindowManagerDelegate* window_manager_delegate_;
134 WindowTreeClientDelegate* window_tree_client_delegate_; 133 WindowTreeClientDelegate* window_tree_client_delegate_;
135 134
136 bool use_mus_ = false; 135 bool use_mus_ = false;
137 bool setup_called_ = false; 136 bool setup_called_ = false;
138 bool teardown_called_ = false; 137 bool teardown_called_ = false;
(...skipping 18 matching lines...) Expand all
157 private: 156 private:
158 bool setup_called_ = false; 157 bool setup_called_ = false;
159 158
160 DISALLOW_COPY_AND_ASSIGN(AuraTestBaseWithType); 159 DISALLOW_COPY_AND_ASSIGN(AuraTestBaseWithType);
161 }; 160 };
162 161
163 } // namespace test 162 } // namespace test
164 } // namespace aura 163 } // namespace aura
165 164
166 #endif // UI_AURA_TEST_AURA_TEST_BASE_H_ 165 #endif // UI_AURA_TEST_AURA_TEST_BASE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698