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

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

Issue 2514243002: Propagates window type properties during aura-mus window creation (Closed)
Patch Set: merge Created 4 years 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/test/aura_test_base.h ('k') | ui/views/mus/desktop_window_tree_host_mus.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 (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 #include "ui/aura/test/aura_test_base.h" 5 #include "ui/aura/test/aura_test_base.h"
6 6
7 #include "ui/aura/client/window_parenting_client.h" 7 #include "ui/aura/client/window_parenting_client.h"
8 #include "ui/aura/mus/property_utils.h"
8 #include "ui/aura/mus/window_tree_client.h" 9 #include "ui/aura/mus/window_tree_client.h"
9 #include "ui/aura/mus/window_tree_host_mus.h" 10 #include "ui/aura/mus/window_tree_host_mus.h"
10 #include "ui/aura/test/test_window_delegate.h" 11 #include "ui/aura/test/test_window_delegate.h"
11 #include "ui/aura/window.h" 12 #include "ui/aura/window.h"
12 #include "ui/base/ime/input_method_initializer.h" 13 #include "ui/base/ime/input_method_initializer.h"
13 #include "ui/base/material_design/material_design_controller.h" 14 #include "ui/base/material_design/material_design_controller.h"
14 #include "ui/base/test/material_design_controller_test_api.h" 15 #include "ui/base/test/material_design_controller_test_api.h"
15 #include "ui/compositor/test/context_factories_for_test.h" 16 #include "ui/compositor/test/context_factories_for_test.h"
16 #include "ui/events/event_dispatcher.h" 17 #include "ui/events/event_dispatcher.h"
17 #include "ui/events/event_processor.h" 18 #include "ui/events/event_processor.h"
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
158 } 159 }
159 160
160 bool AuraTestBase::OnWmSetProperty( 161 bool AuraTestBase::OnWmSetProperty(
161 Window* window, 162 Window* window,
162 const std::string& name, 163 const std::string& name,
163 std::unique_ptr<std::vector<uint8_t>>* new_data) { 164 std::unique_ptr<std::vector<uint8_t>>* new_data) {
164 return true; 165 return true;
165 } 166 }
166 167
167 Window* AuraTestBase::OnWmCreateTopLevelWindow( 168 Window* AuraTestBase::OnWmCreateTopLevelWindow(
169 ui::mojom::WindowType window_type,
168 std::map<std::string, std::vector<uint8_t>>* properties) { 170 std::map<std::string, std::vector<uint8_t>>* properties) {
169 return new Window(nullptr); 171 Window* window = new Window(nullptr);
172 SetWindowType(window, window_type);
173 return window;
170 } 174 }
171 175
172 void AuraTestBase::OnWmClientJankinessChanged( 176 void AuraTestBase::OnWmClientJankinessChanged(
173 const std::set<Window*>& client_windows, 177 const std::set<Window*>& client_windows,
174 bool janky) {} 178 bool janky) {}
175 179
176 void AuraTestBase::OnWmNewDisplay( 180 void AuraTestBase::OnWmNewDisplay(
177 std::unique_ptr<WindowTreeHostMus> window_tree_host, 181 std::unique_ptr<WindowTreeHostMus> window_tree_host,
178 const display::Display& display) { 182 const display::Display& display) {
179 // Take ownership of the WindowTreeHost. 183 // Take ownership of the WindowTreeHost.
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 217
214 void AuraTestBaseWithType::SetUp() { 218 void AuraTestBaseWithType::SetUp() {
215 DCHECK(!setup_called_); 219 DCHECK(!setup_called_);
216 setup_called_ = true; 220 setup_called_ = true;
217 ConfigureBackend(GetParam()); 221 ConfigureBackend(GetParam());
218 AuraTestBase::SetUp(); 222 AuraTestBase::SetUp();
219 } 223 }
220 224
221 } // namespace test 225 } // namespace test
222 } // namespace aura 226 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/test/aura_test_base.h ('k') | ui/views/mus/desktop_window_tree_host_mus.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698