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

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

Issue 17265006: wayland patch for inspection Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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/aura.gyp ('k') | ui/aura/root_window_host_wayland.h » ('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/command_line.h" 7 #include "base/command_line.h"
8 #include "ui/aura/env_observer.h" 8 #include "ui/aura/env_observer.h"
9 #include "ui/aura/root_window_host.h" 9 #include "ui/aura/root_window_host.h"
10 #include "ui/aura/window.h" 10 #include "ui/aura/window.h"
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 75
76 void Env::RootWindowActivated(RootWindow* root_window) { 76 void Env::RootWindowActivated(RootWindow* root_window) {
77 FOR_EACH_OBSERVER(EnvObserver, observers_, 77 FOR_EACH_OBSERVER(EnvObserver, observers_,
78 OnRootWindowActivated(root_window)); 78 OnRootWindowActivated(root_window));
79 } 79 }
80 80
81 //////////////////////////////////////////////////////////////////////////////// 81 ////////////////////////////////////////////////////////////////////////////////
82 // Env, private: 82 // Env, private:
83 83
84 void Env::Init() { 84 void Env::Init() {
85 #if !defined(USE_X11) && !defined(USE_OZONE) 85 #if !defined(USE_X11) && !defined(USE_OZONE) && !defined(USE_WAYLAND)
86 dispatcher_.reset(CreateDispatcher()); 86 dispatcher_.reset(CreateDispatcher());
87 #endif 87 #endif
88 #if defined(USE_X11) 88 #if defined(USE_X11)
89 // We can't do this with a root window listener because XI_HierarchyChanged 89 // We can't do this with a root window listener because XI_HierarchyChanged
90 // messages don't have a target window. 90 // messages don't have a target window.
91 base::MessagePumpAuraX11::Current()->AddObserver( 91 base::MessagePumpAuraX11::Current()->AddObserver(
92 &device_list_updater_aurax11_); 92 &device_list_updater_aurax11_);
93 #endif 93 #endif
94 ui::Compositor::Initialize(); 94 ui::Compositor::Initialize();
95 } 95 }
(...skipping 13 matching lines...) Expand all
109 109
110 bool Env::CanAcceptEvent(const ui::Event& event) { 110 bool Env::CanAcceptEvent(const ui::Event& event) {
111 return true; 111 return true;
112 } 112 }
113 113
114 ui::EventTarget* Env::GetParentTarget() { 114 ui::EventTarget* Env::GetParentTarget() {
115 return NULL; 115 return NULL;
116 } 116 }
117 117
118 } // namespace aura 118 } // namespace aura
OLDNEW
« no previous file with comments | « ui/aura/aura.gyp ('k') | ui/aura/root_window_host_wayland.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698