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

Side by Side Diff: ui/aura/env.h

Issue 243013006: events: Move the PlatformEventSource creation in aura::Env. (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 | « no previous file | ui/aura/env.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 UI_AURA_ENV_H_ 5 #ifndef UI_AURA_ENV_H_
6 #define UI_AURA_ENV_H_ 6 #define UI_AURA_ENV_H_
7 7
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/observer_list.h" 9 #include "base/observer_list.h"
10 #include "ui/aura/aura_export.h" 10 #include "ui/aura/aura_export.h"
11 #include "ui/events/event_handler.h" 11 #include "ui/events/event_handler.h"
12 #include "ui/events/event_target.h" 12 #include "ui/events/event_target.h"
13 #include "ui/gfx/point.h" 13 #include "ui/gfx/point.h"
14 14
15 namespace ui {
16 class PlatformEventSource;
17 }
15 namespace aura { 18 namespace aura {
16 19
17 namespace test { 20 namespace test {
18 class EnvTestHelper; 21 class EnvTestHelper;
19 } 22 }
20 23
21 class EnvObserver; 24 class EnvObserver;
22 class InputStateLookup; 25 class InputStateLookup;
23 class Window; 26 class Window;
24 class WindowTreeHost; 27 class WindowTreeHost;
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 82
80 ObserverList<EnvObserver> observers_; 83 ObserverList<EnvObserver> observers_;
81 84
82 static Env* instance_; 85 static Env* instance_;
83 int mouse_button_flags_; 86 int mouse_button_flags_;
84 // Location of last mouse event, in screen coordinates. 87 // Location of last mouse event, in screen coordinates.
85 gfx::Point last_mouse_location_; 88 gfx::Point last_mouse_location_;
86 bool is_touch_down_; 89 bool is_touch_down_;
87 90
88 scoped_ptr<InputStateLookup> input_state_lookup_; 91 scoped_ptr<InputStateLookup> input_state_lookup_;
92 scoped_ptr<ui::PlatformEventSource> event_source_;
89 93
90 DISALLOW_COPY_AND_ASSIGN(Env); 94 DISALLOW_COPY_AND_ASSIGN(Env);
91 }; 95 };
92 96
93 } // namespace aura 97 } // namespace aura
94 98
95 #endif // UI_AURA_ENV_H_ 99 #endif // UI_AURA_ENV_H_
OLDNEW
« no previous file with comments | « no previous file | ui/aura/env.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698