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

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

Issue 2745143004: Inform window manager about modal windows in mus+ash. (Closed)
Patch Set: . Created 3 years, 9 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 #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/property_utils.h"
9 #include "ui/aura/mus/window_tree_client.h" 9 #include "ui/aura/mus/window_tree_client.h"
10 #include "ui/aura/mus/window_tree_host_mus.h" 10 #include "ui/aura/mus/window_tree_host_mus.h"
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 return true; 162 return true;
163 } 163 }
164 164
165 bool AuraTestBase::OnWmSetProperty( 165 bool AuraTestBase::OnWmSetProperty(
166 Window* window, 166 Window* window,
167 const std::string& name, 167 const std::string& name,
168 std::unique_ptr<std::vector<uint8_t>>* new_data) { 168 std::unique_ptr<std::vector<uint8_t>>* new_data) {
169 return true; 169 return true;
170 } 170 }
171 171
172 bool AuraTestBase::OnWmSetModalType(aura::Window* window, ui::ModalType type) {
173 return true;
174 }
175
172 void AuraTestBase::OnWmSetCanFocus(Window* window, bool can_focus) {} 176 void AuraTestBase::OnWmSetCanFocus(Window* window, bool can_focus) {}
173 177
174 Window* AuraTestBase::OnWmCreateTopLevelWindow( 178 Window* AuraTestBase::OnWmCreateTopLevelWindow(
175 ui::mojom::WindowType window_type, 179 ui::mojom::WindowType window_type,
176 std::map<std::string, std::vector<uint8_t>>* properties) { 180 std::map<std::string, std::vector<uint8_t>>* properties) {
177 Window* window = new Window(nullptr); 181 Window* window = new Window(nullptr);
178 SetWindowType(window, window_type); 182 SetWindowType(window, window_type);
179 window->Init(ui::LAYER_NOT_DRAWN); 183 window->Init(ui::LAYER_NOT_DRAWN);
180 return window; 184 return window;
181 } 185 }
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 253
250 AuraTestBaseMus::~AuraTestBaseMus() {} 254 AuraTestBaseMus::~AuraTestBaseMus() {}
251 255
252 void AuraTestBaseMus::SetUp() { 256 void AuraTestBaseMus::SetUp() {
253 ConfigureBackend(test::BackendType::MUS); 257 ConfigureBackend(test::BackendType::MUS);
254 AuraTestBase::SetUp(); 258 AuraTestBase::SetUp();
255 } 259 }
256 260
257 } // namespace test 261 } // namespace test
258 } // namespace aura 262 } // namespace aura
OLDNEW
« ui/aura/mus/window_tree_client.cc ('K') | « ui/aura/test/aura_test_base.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698