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

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

Issue 2657873006: Remove WindowTreeClientDelegate::GetCaptureClient() and WindowTreeClient::GetCaptureClient(). (Closed)
Patch Set: rebase 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
« no previous file with comments | « ui/aura/mus/window_tree_client_delegate.h ('k') | ui/aura/test/aura_test_base.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 #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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 ui::mojom::MoveLoopSource source, 119 ui::mojom::MoveLoopSource source,
120 const gfx::Point& cursor_location, 120 const gfx::Point& cursor_location,
121 const base::Callback<void(bool)>& on_done) override; 121 const base::Callback<void(bool)>& on_done) override;
122 void OnWmCancelMoveLoop(Window* window) override; 122 void OnWmCancelMoveLoop(Window* window) override;
123 void OnWmSetClientArea( 123 void OnWmSetClientArea(
124 Window* window, 124 Window* window,
125 const gfx::Insets& insets, 125 const gfx::Insets& insets,
126 const std::vector<gfx::Rect>& additional_client_areas) override; 126 const std::vector<gfx::Rect>& additional_client_areas) override;
127 bool IsWindowActive(aura::Window* window) override; 127 bool IsWindowActive(aura::Window* window) override;
128 void OnWmDeactivateWindow(Window* window) override; 128 void OnWmDeactivateWindow(Window* window) override;
129 client::CaptureClient* GetCaptureClient() override;
130 PropertyConverter* GetPropertyConverter() override; 129 PropertyConverter* GetPropertyConverter() override;
131 130
132 private: 131 private:
133 // Only used for mus. Both are are initialized to this, but may be reset. 132 // Only used for mus. Both are are initialized to this, but may be reset.
134 WindowManagerDelegate* window_manager_delegate_; 133 WindowManagerDelegate* window_manager_delegate_;
135 WindowTreeClientDelegate* window_tree_client_delegate_; 134 WindowTreeClientDelegate* window_tree_client_delegate_;
136 135
137 bool use_mus_ = false; 136 bool use_mus_ = false;
138 bool setup_called_ = false; 137 bool setup_called_ = false;
139 bool teardown_called_ = false; 138 bool teardown_called_ = false;
(...skipping 30 matching lines...) Expand all
170 void SetUp() override; 169 void SetUp() override;
171 170
172 private: 171 private:
173 DISALLOW_COPY_AND_ASSIGN(AuraTestBaseMus); 172 DISALLOW_COPY_AND_ASSIGN(AuraTestBaseMus);
174 }; 173 };
175 174
176 } // namespace test 175 } // namespace test
177 } // namespace aura 176 } // namespace aura
178 177
179 #endif // UI_AURA_TEST_AURA_TEST_BASE_H_ 178 #endif // UI_AURA_TEST_AURA_TEST_BASE_H_
OLDNEW
« no previous file with comments | « ui/aura/mus/window_tree_client_delegate.h ('k') | ui/aura/test/aura_test_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698