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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc

Issue 1155013005: Refactoring the ownership of ui::InputMethod. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased. Created 5 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
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_window_tree_host_x11.h" 5 #include "ui/views/widget/desktop_aura/desktop_window_tree_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 995 matching lines...) Expand 10 before | Expand all | Expand 10 after
1006 bounds_in_pixels_.x() + location.x(), 1006 bounds_in_pixels_.x() + location.x(),
1007 bounds_in_pixels_.y() + location.y()); 1007 bounds_in_pixels_.y() + location.y());
1008 } 1008 }
1009 1009
1010 void DesktopWindowTreeHostX11::OnCursorVisibilityChangedNative(bool show) { 1010 void DesktopWindowTreeHostX11::OnCursorVisibilityChangedNative(bool show) {
1011 // TODO(erg): Conditional on us enabling touch on desktop linux builds, do 1011 // TODO(erg): Conditional on us enabling touch on desktop linux builds, do
1012 // the same tap-to-click disabling here that chromeos does. 1012 // the same tap-to-click disabling here that chromeos does.
1013 } 1013 }
1014 1014
1015 //////////////////////////////////////////////////////////////////////////////// 1015 ////////////////////////////////////////////////////////////////////////////////
1016 // DesktopWindowTreeHostX11, ui::EventSource implementation:
1017
1018 ui::EventProcessor* DesktopWindowTreeHostX11::GetEventProcessor() {
1019 return dispatcher();
1020 }
1021
1022 ////////////////////////////////////////////////////////////////////////////////
1023 // DesktopWindowTreeHostX11, private: 1016 // DesktopWindowTreeHostX11, private:
1024 1017
1025 void DesktopWindowTreeHostX11::InitX11Window( 1018 void DesktopWindowTreeHostX11::InitX11Window(
1026 const Widget::InitParams& params) { 1019 const Widget::InitParams& params) {
1027 unsigned long attribute_mask = CWBackPixmap; 1020 unsigned long attribute_mask = CWBackPixmap;
1028 XSetWindowAttributes swa; 1021 XSetWindowAttributes swa;
1029 memset(&swa, 0, sizeof(swa)); 1022 memset(&swa, 0, sizeof(swa));
1030 swa.background_pixmap = None; 1023 swa.background_pixmap = None;
1031 1024
1032 ::Atom window_type; 1025 ::Atom window_type;
(...skipping 964 matching lines...) Expand 10 before | Expand all | Expand 10 after
1997 if (linux_ui) { 1990 if (linux_ui) {
1998 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); 1991 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window);
1999 if (native_theme) 1992 if (native_theme)
2000 return native_theme; 1993 return native_theme;
2001 } 1994 }
2002 1995
2003 return ui::NativeTheme::instance(); 1996 return ui::NativeTheme::instance();
2004 } 1997 }
2005 1998
2006 } // namespace views 1999 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698