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

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

Issue 224113005: Eliminate ash::internal namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 8 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/touch/touch_hud_projection.cc ('k') | ash/touch/touch_observer_hud.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"
11 #include "ui/gfx/display_observer.h" 11 #include "ui/gfx/display_observer.h"
12 #include "ui/views/widget/widget_observer.h" 12 #include "ui/views/widget/widget_observer.h"
13 13
14 #if defined(OS_CHROMEOS) 14 #if defined(OS_CHROMEOS)
15 #include "ui/display/chromeos/output_configurator.h" 15 #include "ui/display/chromeos/output_configurator.h"
16 #endif // defined(OS_CHROMEOS) 16 #endif // defined(OS_CHROMEOS)
17 17
18 namespace views { 18 namespace views {
19 class Widget; 19 class Widget;
20 } 20 }
21 21
22 namespace ash { 22 namespace ash {
23 namespace internal {
24 23
25 // An event filter which handles system level gesture events. Objects of this 24 // An event filter which handles system level gesture events. Objects of this
26 // class manage their own lifetime. 25 // class manage their own lifetime.
27 class ASH_EXPORT TouchObserverHUD : public ui::EventHandler, 26 class ASH_EXPORT TouchObserverHUD : public ui::EventHandler,
28 public views::WidgetObserver, 27 public views::WidgetObserver,
29 public gfx::DisplayObserver, 28 public gfx::DisplayObserver,
30 #if defined(OS_CHROMEOS) 29 #if defined(OS_CHROMEOS)
31 public ui::OutputConfigurator::Observer, 30 public ui::OutputConfigurator::Observer,
32 #endif // defined(OS_CHROMEOS) 31 #endif // defined(OS_CHROMEOS)
33 public DisplayController::Observer { 32 public DisplayController::Observer {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 friend class TouchHudTestBase; 78 friend class TouchHudTestBase;
80 79
81 const int64 display_id_; 80 const int64 display_id_;
82 aura::Window* root_window_; 81 aura::Window* root_window_;
83 82
84 views::Widget* widget_; 83 views::Widget* widget_;
85 84
86 DISALLOW_COPY_AND_ASSIGN(TouchObserverHUD); 85 DISALLOW_COPY_AND_ASSIGN(TouchObserverHUD);
87 }; 86 };
88 87
89 } // namespace internal
90 } // namespace ash 88 } // namespace ash
91 89
92 #endif // ASH_TOUCH_TOUCH_OBSERVER_HUD_H_ 90 #endif // ASH_TOUCH_TOUCH_OBSERVER_HUD_H_
OLDNEW
« no previous file with comments | « ash/touch/touch_hud_projection.cc ('k') | ash/touch/touch_observer_hud.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698