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

Unified Diff: ash/touch/touch_observer_hud.cc

Issue 2618143002: cros: Remove some OS platform ifdefs from ash (Closed)
Patch Set: rebase Created 3 years, 11 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/touch/touch_observer_hud.h ('k') | ash/touch/touch_observer_hud_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/touch/touch_observer_hud.cc
diff --git a/ash/touch/touch_observer_hud.cc b/ash/touch/touch_observer_hud.cc
index 2dee444a178a48432e176d8570d77e6860b92140..4e302568f4ce4afb4fd0c69390c63e8cb7ef502f 100644
--- a/ash/touch/touch_observer_hud.cc
+++ b/ash/touch/touch_observer_hud.cc
@@ -47,20 +47,14 @@ TouchObserverHUD::TouchObserverHUD(aura::Window* initial_root)
// Observe changes in display size and mode to update touch HUD.
display::Screen::GetScreen()->AddObserver(this);
-#if defined(OS_CHROMEOS)
Shell::GetInstance()->display_configurator()->AddObserver(this);
-#endif // defined(OS_CHROMEOS)
-
Shell::GetInstance()->window_tree_host_manager()->AddObserver(this);
root_window_->AddPreTargetHandler(this);
}
TouchObserverHUD::~TouchObserverHUD() {
Shell::GetInstance()->window_tree_host_manager()->RemoveObserver(this);
-
-#if defined(OS_CHROMEOS)
Shell::GetInstance()->display_configurator()->RemoveObserver(this);
-#endif // defined(OS_CHROMEOS)
display::Screen::GetScreen()->RemoveObserver(this);
widget_->RemoveObserver(this);
@@ -100,14 +94,12 @@ void TouchObserverHUD::OnDisplayMetricsChanged(const display::Display& display,
widget_->SetSize(display.size());
}
-#if defined(OS_CHROMEOS)
void TouchObserverHUD::OnDisplayModeChanged(
const display::DisplayConfigurator::DisplayStateList& outputs) {
// Clear touch HUD for any change in display mode (single, dual extended, dual
// mirrored, ...).
Clear();
}
-#endif // defined(OS_CHROMEOS)
void TouchObserverHUD::OnDisplaysInitialized() {
OnDisplayConfigurationChanged();
« no previous file with comments | « ash/touch/touch_observer_hud.h ('k') | ash/touch/touch_observer_hud_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698