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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ash/root_window_controller.cc

Issue 2322613002: Adds support for multiple displays to WmTestBase (Closed)
Patch Set: feedback Created 4 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/mus/workspace/workspace_layout_manager_unittest.cc ('k') | services/ui/public/cpp/tests/test_window_tree_client_setup.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/root_window_controller.cc
diff --git a/ash/root_window_controller.cc b/ash/root_window_controller.cc
index ecd47cd8c15a0b1b50237b48d12916b79248d3b7..c17692920afd1f9d18c9a16922a406beeec845ad 100644
--- a/ash/root_window_controller.cc
+++ b/ash/root_window_controller.cc
@@ -339,9 +339,7 @@ void RootWindowController::Shutdown() {
WmShell::Get()->RemoveShellObserver(this);
#if defined(OS_CHROMEOS)
- if (touch_exploration_manager_) {
- touch_exploration_manager_.reset();
- }
+ touch_exploration_manager_.reset();
#endif
aura::Window* root_window = GetRootWindow();
« no previous file with comments | « ash/mus/workspace/workspace_layout_manager_unittest.cc ('k') | services/ui/public/cpp/tests/test_window_tree_client_setup.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698