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

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

Issue 37733003: Make GetRootWindow() return a Window instead of a RootWindow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 2 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
« no previous file with comments | « ash/test/ui_controls_factory_ash.cc ('k') | ash/touch/touch_observer_hud_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 #endif // defined(OS_CHROMEOS) 73 #endif // defined(OS_CHROMEOS)
74 74
75 // Overriden form DisplayController::Observer. 75 // Overriden form DisplayController::Observer.
76 virtual void OnDisplayConfigurationChanging() OVERRIDE; 76 virtual void OnDisplayConfigurationChanging() OVERRIDE;
77 virtual void OnDisplayConfigurationChanged() OVERRIDE; 77 virtual void OnDisplayConfigurationChanged() OVERRIDE;
78 78
79 private: 79 private:
80 friend class TouchHudTest; 80 friend class TouchHudTest;
81 81
82 const int64 display_id_; 82 const int64 display_id_;
83 aura::RootWindow* root_window_; 83 aura::Window* root_window_;
84 84
85 views::Widget* widget_; 85 views::Widget* widget_;
86 86
87 DISALLOW_COPY_AND_ASSIGN(TouchObserverHUD); 87 DISALLOW_COPY_AND_ASSIGN(TouchObserverHUD);
88 }; 88 };
89 89
90 } // namespace internal 90 } // namespace internal
91 } // namespace ash 91 } // namespace ash
92 92
93 #endif // ASH_TOUCH_TOUCH_OBSERVER_HUD_H_ 93 #endif // ASH_TOUCH_TOUCH_OBSERVER_HUD_H_
OLDNEW
« no previous file with comments | « ash/test/ui_controls_factory_ash.cc ('k') | ash/touch/touch_observer_hud_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698