OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef ASH_TOUCH_TOUCH_OBSERVER_HUD_H_ | 5 #ifndef ASH_TOUCH_TOUCH_OBSERVER_HUD_H_ |
6 #define ASH_TOUCH_TOUCH_OBSERVER_HUD_H_ | 6 #define ASH_TOUCH_TOUCH_OBSERVER_HUD_H_ |
7 | 7 |
8 #include "ash/ash_export.h" | 8 #include "ash/ash_export.h" |
9 #include "ash/display/display_controller.h" | 9 #include "ash/display/display_controller.h" |
10 #include "ui/events/event_handler.h" | 10 #include "ui/events/event_handler.h" |
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
52 | 52 |
53 views::Widget* widget() { return widget_; } | 53 views::Widget* widget() { return widget_; } |
54 | 54 |
55 // Overriden from ui::EventHandler. | 55 // Overriden from ui::EventHandler. |
56 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; | 56 virtual void OnTouchEvent(ui::TouchEvent* event) OVERRIDE; |
57 | 57 |
58 // Overridden from views::WidgetObserver. | 58 // Overridden from views::WidgetObserver. |
59 virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; | 59 virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; |
60 | 60 |
61 // Overridden from gfx::DisplayObserver. | 61 // Overridden from gfx::DisplayObserver. |
62 virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE; | |
63 virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; | 62 virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; |
64 virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; | 63 virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; |
| 64 virtual void OnDisplayMetricsChanged( |
| 65 const gfx::Display& display, |
| 66 DisplayObserver::DisplayMetrics metrics) OVERRIDE; |
65 | 67 |
66 #if defined(OS_CHROMEOS) | 68 #if defined(OS_CHROMEOS) |
67 // Overriden from ui::DisplayConfigurator::Observer. | 69 // Overriden from ui::DisplayConfigurator::Observer. |
68 virtual void OnDisplayModeChanged( | 70 virtual void OnDisplayModeChanged( |
69 const ui::DisplayConfigurator::DisplayStateList& outputs) OVERRIDE; | 71 const ui::DisplayConfigurator::DisplayStateList& outputs) OVERRIDE; |
70 #endif // defined(OS_CHROMEOS) | 72 #endif // defined(OS_CHROMEOS) |
71 | 73 |
72 // Overriden form DisplayController::Observer. | 74 // Overriden form DisplayController::Observer. |
73 virtual void OnDisplaysInitialized() OVERRIDE; | 75 virtual void OnDisplaysInitialized() OVERRIDE; |
74 virtual void OnDisplayConfigurationChanging() OVERRIDE; | 76 virtual void OnDisplayConfigurationChanging() OVERRIDE; |
75 virtual void OnDisplayConfigurationChanged() OVERRIDE; | 77 virtual void OnDisplayConfigurationChanged() OVERRIDE; |
76 | 78 |
77 private: | 79 private: |
78 friend class TouchHudTestBase; | 80 friend class TouchHudTestBase; |
79 | 81 |
80 const int64 display_id_; | 82 const int64 display_id_; |
81 aura::Window* root_window_; | 83 aura::Window* root_window_; |
82 | 84 |
83 views::Widget* widget_; | 85 views::Widget* widget_; |
84 | 86 |
85 DISALLOW_COPY_AND_ASSIGN(TouchObserverHUD); | 87 DISALLOW_COPY_AND_ASSIGN(TouchObserverHUD); |
86 }; | 88 }; |
87 | 89 |
88 } // namespace ash | 90 } // namespace ash |
89 | 91 |
90 #endif // ASH_TOUCH_TOUCH_OBSERVER_HUD_H_ | 92 #endif // ASH_TOUCH_TOUCH_OBSERVER_HUD_H_ |
OLD | NEW |