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

Unified Diff: ui/aura/test/aura_test_base.cc

Issue 2535983004: Makes sure bounds and visibilty are updated correctly for new displays (Closed)
Patch Set: Created 4 years, 1 month 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 side-by-side diff with in-line comments
Download patch
Index: ui/aura/test/aura_test_base.cc
diff --git a/ui/aura/test/aura_test_base.cc b/ui/aura/test/aura_test_base.cc
index ca5d93f9c5009697d696d00e885354728a339cb9..167f52b377a0501571f0ab851090a85f69eae378 100644
--- a/ui/aura/test/aura_test_base.cc
+++ b/ui/aura/test/aura_test_base.cc
@@ -92,6 +92,8 @@ void AuraTestBase::TearDown() {
// and these tasks if un-executed would upset Valgrind.
RunAllPendingInMessageLoop();
+ window_tree_hosts_.clear();
+
helper_->TearDown();
ui::TerminateContextFactoryForTests();
ui::ShutdownInputMethodForTesting();
@@ -182,12 +184,18 @@ void AuraTestBase::OnWmNewDisplay(
std::unique_ptr<WindowTreeHostMus> window_tree_host,
const display::Display& display) {
// Take ownership of the WindowTreeHost.
- window_tree_host_mus_ = std::move(window_tree_host);
+ window_tree_hosts_.push_back(std::move(window_tree_host));
}
void AuraTestBase::OnWmDisplayRemoved(WindowTreeHostMus* window_tree_host) {
- if (window_tree_host_mus_.get() == window_tree_host)
- window_tree_host_mus_.reset();
+ for (auto iter = window_tree_hosts_.begin(); iter != window_tree_hosts_.end();
+ ++iter) {
+ if (iter->get() == window_tree_host) {
+ window_tree_hosts_.erase(iter);
+ return;
+ }
+ }
+ NOTREACHED();
}
void AuraTestBase::OnWmDisplayModified(const display::Display& display) {}

Powered by Google App Engine
This is Rietveld 408576698