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

Side by Side Diff: ash/touch/touch_observer_hud.h

Issue 22871010: chromeos: Include mode details in OutputSnapshot. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: minor changes Created 7 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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/base/events/event_handler.h" 10 #include "ui/base/events/event_handler.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 // Overridden from views::WidgetObserver. 60 // Overridden from views::WidgetObserver.
61 virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE; 61 virtual void OnWidgetDestroying(views::Widget* widget) OVERRIDE;
62 62
63 // Overridden from gfx::DisplayObserver. 63 // Overridden from gfx::DisplayObserver.
64 virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE; 64 virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE;
65 virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE; 65 virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE;
66 virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE; 66 virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE;
67 67
68 #if defined(OS_CHROMEOS) 68 #if defined(OS_CHROMEOS)
69 // Overriden from chromeos::OutputConfigurator::Observer. 69 // Overriden from chromeos::OutputConfigurator::Observer.
70 virtual void OnDisplayModeChanged() OVERRIDE; 70 virtual void OnDisplayModeChanged(
71 const std::vector<chromeos::OutputConfigurator::OutputSnapshot>& outputs)
72 OVERRIDE;
71 #endif // defined(OS_CHROMEOS) 73 #endif // defined(OS_CHROMEOS)
72 74
73 // Overriden form DisplayController::Observer. 75 // Overriden form DisplayController::Observer.
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 TouchHudTest; 80 friend class TouchHudTest;
79 81
80 const int64 display_id_; 82 const int64 display_id_;
81 aura::RootWindow* root_window_; 83 aura::RootWindow* 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 internal 90 } // namespace internal
89 } // namespace ash 91 } // namespace ash
90 92
91 #endif // ASH_TOUCH_TOUCH_OBSERVER_HUD_H_ 93 #endif // ASH_TOUCH_TOUCH_OBSERVER_HUD_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698