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

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

Issue 379233005: ozone: Move public files to ui/ozone/public & update public DEPS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 5 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 | « ui/aura/DEPS ('k') | ui/display/chromeos/ozone/DEPS » ('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 #include "ui/aura/env.h" 5 #include "ui/aura/env.h"
6 6
7 #include "base/lazy_instance.h" 7 #include "base/lazy_instance.h"
8 #include "base/threading/thread_local.h" 8 #include "base/threading/thread_local.h"
9 #include "ui/aura/env_observer.h" 9 #include "ui/aura/env_observer.h"
10 #include "ui/aura/input_state_lookup.h" 10 #include "ui/aura/input_state_lookup.h"
11 #include "ui/events/event_target_iterator.h" 11 #include "ui/events/event_target_iterator.h"
12 #include "ui/events/platform/platform_event_source.h" 12 #include "ui/events/platform/platform_event_source.h"
13 13
14 #if defined(USE_OZONE) 14 #if defined(USE_OZONE)
15 #include "ui/ozone/ozone_platform.h" 15 #include "ui/ozone/public/ozone_platform.h"
16 #endif 16 #endif
17 17
18 namespace aura { 18 namespace aura {
19 19
20 namespace { 20 namespace {
21 21
22 // Env is thread local so that aura may be used on multiple threads. 22 // Env is thread local so that aura may be used on multiple threads.
23 base::LazyInstance<base::ThreadLocalPointer<Env> >::Leaky lazy_tls_ptr = 23 base::LazyInstance<base::ThreadLocalPointer<Env> >::Leaky lazy_tls_ptr =
24 LAZY_INSTANCE_INITIALIZER; 24 LAZY_INSTANCE_INITIALIZER;
25 25
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 scoped_ptr<ui::EventTargetIterator> Env::GetChildIterator() const { 114 scoped_ptr<ui::EventTargetIterator> Env::GetChildIterator() const {
115 return scoped_ptr<ui::EventTargetIterator>(); 115 return scoped_ptr<ui::EventTargetIterator>();
116 } 116 }
117 117
118 ui::EventTargeter* Env::GetEventTargeter() { 118 ui::EventTargeter* Env::GetEventTargeter() {
119 NOTREACHED(); 119 NOTREACHED();
120 return NULL; 120 return NULL;
121 } 121 }
122 122
123 } // namespace aura 123 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/DEPS ('k') | ui/display/chromeos/ozone/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698