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

Unified Diff: ui/views/test/views_test_helper_aura.cc

Issue 2466023003: Makes CaptureController be created and owned by WMState (Closed)
Patch Set: moar 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
« no previous file with comments | « ui/views/corewm/desktop_capture_controller_unittest.cc ('k') | ui/wm/core/capture_controller.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/test/views_test_helper_aura.cc
diff --git a/ui/views/test/views_test_helper_aura.cc b/ui/views/test/views_test_helper_aura.cc
index 0460cac067790fc5c321bc7357024d2548fe6113..b9067c8b5e8586a99374d899e91408145a55eb63 100644
--- a/ui/views/test/views_test_helper_aura.cc
+++ b/ui/views/test/views_test_helper_aura.cc
@@ -54,7 +54,8 @@ void ViewsTestHelperAura::TearDown() {
aura::client::SetScreenPositionClient(GetContext(), nullptr);
aura_test_helper_->TearDown();
- CHECK(!wm::ScopedCaptureClient::IsActive());
+ CHECK(!wm::CaptureController::Get() ||
+ !wm::CaptureController::Get()->is_active());
}
gfx::NativeWindow ViewsTestHelperAura::GetContext() {
« no previous file with comments | « ui/views/corewm/desktop_capture_controller_unittest.cc ('k') | ui/wm/core/capture_controller.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698