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

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

Issue 187073002: Refactoring display configuration state to allow generic state objects (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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/events/event_handler.h" 10 #include "ui/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( 70 virtual void OnDisplayModeChanged(const std::vector<
71 const std::vector<chromeos::OutputConfigurator::OutputSnapshot>& outputs) 71 chromeos::OutputConfigurator::InternalDisplayState>& outputs) OVERRIDE;
72 OVERRIDE;
73 #endif // defined(OS_CHROMEOS) 72 #endif // defined(OS_CHROMEOS)
74 73
75 // Overriden form DisplayController::Observer. 74 // Overriden form DisplayController::Observer.
76 virtual void OnDisplayConfigurationChanging() OVERRIDE; 75 virtual void OnDisplayConfigurationChanging() OVERRIDE;
77 virtual void OnDisplayConfigurationChanged() OVERRIDE; 76 virtual void OnDisplayConfigurationChanged() OVERRIDE;
78 77
79 private: 78 private:
80 friend class TouchHudTestBase; 79 friend class TouchHudTestBase;
81 80
82 const int64 display_id_; 81 const int64 display_id_;
83 aura::Window* root_window_; 82 aura::Window* root_window_;
84 83
85 views::Widget* widget_; 84 views::Widget* widget_;
86 85
87 DISALLOW_COPY_AND_ASSIGN(TouchObserverHUD); 86 DISALLOW_COPY_AND_ASSIGN(TouchObserverHUD);
88 }; 87 };
89 88
90 } // namespace internal 89 } // namespace internal
91 } // namespace ash 90 } // namespace ash
92 91
93 #endif // ASH_TOUCH_TOUCH_OBSERVER_HUD_H_ 92 #endif // ASH_TOUCH_TOUCH_OBSERVER_HUD_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698