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

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: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/aura/test/aura_test_base.h ('k') | ui/aura/test/mus/window_tree_client_private.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 1047665a928a40010917f6b6ecd2142acd8d5655..31b00ae13d90c04ff9384f039f6402164416942c 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();
@@ -184,12 +186,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) {}
« no previous file with comments | « ui/aura/test/aura_test_base.h ('k') | ui/aura/test/mus/window_tree_client_private.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698