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

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

Issue 2759643003: Add system modals to the proper container in mus+ash. (Closed)
Patch Set: addressed feedback. 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
« no previous file with comments | « ui/aura/test/aura_test_base.h ('k') | no next file » | 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/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 void AuraTestBase::OnWmSetModalType(Window* window, ui::ModalType type) {}
173
172 void AuraTestBase::OnWmSetCanFocus(Window* window, bool can_focus) {} 174 void AuraTestBase::OnWmSetCanFocus(Window* window, bool can_focus) {}
173 175
174 Window* AuraTestBase::OnWmCreateTopLevelWindow( 176 Window* AuraTestBase::OnWmCreateTopLevelWindow(
175 ui::mojom::WindowType window_type, 177 ui::mojom::WindowType window_type,
176 std::map<std::string, std::vector<uint8_t>>* properties) { 178 std::map<std::string, std::vector<uint8_t>>* properties) {
177 Window* window = new Window(nullptr); 179 Window* window = new Window(nullptr);
178 SetWindowType(window, window_type); 180 SetWindowType(window, window_type);
179 window->Init(ui::LAYER_NOT_DRAWN); 181 window->Init(ui::LAYER_NOT_DRAWN);
180 return window; 182 return window;
181 } 183 }
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
249 251
250 AuraTestBaseMus::~AuraTestBaseMus() {} 252 AuraTestBaseMus::~AuraTestBaseMus() {}
251 253
252 void AuraTestBaseMus::SetUp() { 254 void AuraTestBaseMus::SetUp() {
253 ConfigureBackend(test::BackendType::MUS); 255 ConfigureBackend(test::BackendType::MUS);
254 AuraTestBase::SetUp(); 256 AuraTestBase::SetUp();
255 } 257 }
256 258
257 } // namespace test 259 } // namespace test
258 } // namespace aura 260 } // namespace aura
OLDNEW
« no previous file with comments | « 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