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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_root_window_host_x11.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/views/widget/desktop_aura/desktop_root_window_host_x11.h" 5 #include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h"
6 6
7 #include <X11/extensions/shape.h> 7 #include <X11/extensions/shape.h>
8 #include <X11/extensions/XInput2.h> 8 #include <X11/extensions/XInput2.h>
9 #include <X11/Xatom.h> 9 #include <X11/Xatom.h>
10 #include <X11/Xregion.h> 10 #include <X11/Xregion.h>
(...skipping 1181 matching lines...) Expand 10 before | Expand all | Expand 10 after
1192 data->push_back(bitmap.getColor(x, y)); 1192 data->push_back(bitmap.getColor(x, y));
1193 } 1193 }
1194 1194
1195 std::list<XID>& DesktopWindowTreeHostX11::open_windows() { 1195 std::list<XID>& DesktopWindowTreeHostX11::open_windows() {
1196 if (!open_windows_) 1196 if (!open_windows_)
1197 open_windows_ = new std::list<XID>(); 1197 open_windows_ = new std::list<XID>();
1198 return *open_windows_; 1198 return *open_windows_;
1199 } 1199 }
1200 1200
1201 //////////////////////////////////////////////////////////////////////////////// 1201 ////////////////////////////////////////////////////////////////////////////////
1202 // DesktopWindowTreeHostX11, MessageLoop::Dispatcher implementation: 1202 // DesktopWindowTreeHostX11, MessagePumpDispatcher implementation:
1203 1203
1204 bool DesktopWindowTreeHostX11::Dispatch(const base::NativeEvent& event) { 1204 bool DesktopWindowTreeHostX11::Dispatch(const base::NativeEvent& event) {
1205 XEvent* xev = event; 1205 XEvent* xev = event;
1206 1206
1207 TRACE_EVENT1("views", "DesktopWindowTreeHostX11::Dispatch", 1207 TRACE_EVENT1("views", "DesktopWindowTreeHostX11::Dispatch",
1208 "event->type", event->type); 1208 "event->type", event->type);
1209 1209
1210 // May want to factor CheckXEventForConsistency(xev); into a common location 1210 // May want to factor CheckXEventForConsistency(xev); into a common location
1211 // since it is called here. 1211 // since it is called here.
1212 switch (xev->type) { 1212 switch (xev->type) {
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after
1550 if (linux_ui) { 1550 if (linux_ui) {
1551 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(); 1551 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme();
1552 if (native_theme) 1552 if (native_theme)
1553 return native_theme; 1553 return native_theme;
1554 } 1554 }
1555 1555
1556 return ui::NativeTheme::instance(); 1556 return ui::NativeTheme::instance();
1557 } 1557 }
1558 1558
1559 } // namespace views 1559 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698