diff options
| author | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 21:08:56 +0000 |
|---|---|---|
| committer | dnicoara@chromium.org <dnicoara@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-14 21:08:56 +0000 |
| commit | 29957af3773acac8b16aa37d33d4bde727a32a21 (patch) | |
| tree | 6410e95393f295ca054423e944777dbc4a516e23 /ash/touch/touch_observer_hud.h | |
| parent | 112eb8dba36a81b7a979130a608ec51befd511b5 (diff) | |
| download | chromium_src-29957af3773acac8b16aa37d33d4bde727a32a21.zip chromium_src-29957af3773acac8b16aa37d33d4bde727a32a21.tar.gz chromium_src-29957af3773acac8b16aa37d33d4bde727a32a21.tar.bz2 | |
Move chromeos/display/* to ui/display/chromeos
TBR=darin@chromium.org
BUG=333413
Review URL: https://codereview.chromium.org/192483007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257197 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/touch/touch_observer_hud.h')
| -rw-r--r-- | ash/touch/touch_observer_hud.h | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/ash/touch/touch_observer_hud.h b/ash/touch/touch_observer_hud.h index 4e74e76..2ee52bd 100644 --- a/ash/touch/touch_observer_hud.h +++ b/ash/touch/touch_observer_hud.h @@ -12,7 +12,7 @@ #include "ui/views/widget/widget_observer.h" #if defined(OS_CHROMEOS) -#include "chromeos/display/output_configurator.h" +#include "ui/display/chromeos/output_configurator.h" #endif // defined(OS_CHROMEOS) namespace views { @@ -24,14 +24,13 @@ namespace internal { // An event filter which handles system level gesture events. Objects of this // class manage their own lifetime. -class ASH_EXPORT TouchObserverHUD - : public ui::EventHandler, - public views::WidgetObserver, - public gfx::DisplayObserver, +class ASH_EXPORT TouchObserverHUD : public ui::EventHandler, + public views::WidgetObserver, + public gfx::DisplayObserver, #if defined(OS_CHROMEOS) - public chromeos::OutputConfigurator::Observer, + public ui::OutputConfigurator::Observer, #endif // defined(OS_CHROMEOS) - public DisplayController::Observer { + public DisplayController::Observer { public: // Called to clear touch points and traces from the screen. Default // implementation does nothing. Sub-classes should implement appropriately. @@ -66,10 +65,9 @@ class ASH_EXPORT TouchObserverHUD virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; #if defined(OS_CHROMEOS) - // Overriden from chromeos::OutputConfigurator::Observer. - virtual void OnDisplayModeChanged( - const std::vector<chromeos::OutputConfigurator::OutputSnapshot>& outputs) - OVERRIDE; + // Overriden from ui::OutputConfigurator::Observer. + virtual void OnDisplayModeChanged(const std::vector< + ui::OutputConfigurator::OutputSnapshot>& outputs) OVERRIDE; #endif // defined(OS_CHROMEOS) // Overriden form DisplayController::Observer. |