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

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

Issue 135563004: Nukes MessageLoop::Dispatcher (2) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 years, 11 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 #include "ui/aura/env.h" 5 #include "ui/aura/env.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/message_loop/message_pump_dispatcher.h" 8 #include "base/message_loop/message_pump_dispatcher.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"
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 69
70 void Env::RemoveObserver(EnvObserver* observer) { 70 void Env::RemoveObserver(EnvObserver* observer) {
71 observers_.RemoveObserver(observer); 71 observers_.RemoveObserver(observer);
72 } 72 }
73 73
74 bool Env::IsMouseButtonDown() const { 74 bool Env::IsMouseButtonDown() const {
75 return input_state_lookup_.get() ? input_state_lookup_->IsMouseButtonDown() : 75 return input_state_lookup_.get() ? input_state_lookup_->IsMouseButtonDown() :
76 mouse_button_flags_ != 0; 76 mouse_button_flags_ != 0;
77 } 77 }
78 78
79 base::MessageLoop::Dispatcher* Env::GetDispatcher() { 79 base::MessagePumpDispatcher* Env::GetDispatcher() {
80 #if defined(USE_X11) 80 #if defined(USE_X11)
81 return base::MessagePumpX11::Current(); 81 return base::MessagePumpX11::Current();
82 #else 82 #else
83 return dispatcher_.get(); 83 return dispatcher_.get();
84 #endif 84 #endif
85 } 85 }
86 86
87 void Env::RootWindowActivated(RootWindow* root_window) { 87 void Env::RootWindowActivated(RootWindow* root_window) {
88 FOR_EACH_OBSERVER(EnvObserver, observers_, 88 FOR_EACH_OBSERVER(EnvObserver, observers_,
89 OnRootWindowActivated(root_window)); 89 OnRootWindowActivated(root_window));
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 scoped_ptr<ui::EventTargetIterator> Env::GetChildIterator() const { 130 scoped_ptr<ui::EventTargetIterator> Env::GetChildIterator() const {
131 return scoped_ptr<ui::EventTargetIterator>(); 131 return scoped_ptr<ui::EventTargetIterator>();
132 } 132 }
133 133
134 ui::EventTargeter* Env::GetEventTargeter() { 134 ui::EventTargeter* Env::GetEventTargeter() {
135 NOTREACHED(); 135 NOTREACHED();
136 return NULL; 136 return NULL;
137 } 137 }
138 138
139 } // namespace aura 139 } // namespace aura
OLDNEW
« base/run_loop.h ('K') | « ui/aura/env.h ('k') | ui/aura/root_window_host_ozone.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698