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

Unified Diff: ash/touch/touch_observer_hud.h

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/tooltips/tooltip_controller_unittest.cc ('k') | ash/touch/touch_observer_hud.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/touch/touch_observer_hud.h
diff --git a/ash/touch/touch_observer_hud.h b/ash/touch/touch_observer_hud.h
index b3c6ee2af232f598ef5f470ca55b2b7d6b935683..4c1fd07f500975421eada2ea710a686267ea890e 100644
--- a/ash/touch/touch_observer_hud.h
+++ b/ash/touch/touch_observer_hud.h
@@ -11,13 +11,10 @@
#include "ash/display/window_tree_host_manager.h"
#include "base/macros.h"
#include "ui/display/display_observer.h"
+#include "ui/display/manager/chromeos/display_configurator.h"
#include "ui/events/event_handler.h"
#include "ui/views/widget/widget_observer.h"
-#if defined(OS_CHROMEOS)
-#include "ui/display/manager/chromeos/display_configurator.h"
-#endif // defined(OS_CHROMEOS)
-
namespace views {
class Widget;
}
@@ -30,9 +27,7 @@ class ASH_EXPORT TouchObserverHUD
: public ui::EventHandler,
public views::WidgetObserver,
public display::DisplayObserver,
-#if defined(OS_CHROMEOS)
public display::DisplayConfigurator::Observer,
-#endif // defined(OS_CHROMEOS)
public WindowTreeHostManager::Observer {
public:
// Called to clear touch points and traces from the screen. Default
@@ -68,11 +63,9 @@ class ASH_EXPORT TouchObserverHUD
void OnDisplayMetricsChanged(const display::Display& display,
uint32_t metrics) override;
-#if defined(OS_CHROMEOS)
// Overriden from display::DisplayConfigurator::Observer.
void OnDisplayModeChanged(
const display::DisplayConfigurator::DisplayStateList& outputs) override;
-#endif // defined(OS_CHROMEOS)
// Overriden form WindowTreeHostManager::Observer.
void OnDisplaysInitialized() override;
« no previous file with comments | « ash/tooltips/tooltip_controller_unittest.cc ('k') | ash/touch/touch_observer_hud.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698