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

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: 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 997 matching lines...) Expand 10 before | Expand all | Expand 10 after
1008 bounds_in_pixels_.x() + location.x(), 1008 bounds_in_pixels_.x() + location.x(),
1009 bounds_in_pixels_.y() + location.y()); 1009 bounds_in_pixels_.y() + location.y());
1010 } 1010 }
1011 1011
1012 void DesktopWindowTreeHostX11::OnCursorVisibilityChangedNative(bool show) { 1012 void DesktopWindowTreeHostX11::OnCursorVisibilityChangedNative(bool show) {
1013 // TODO(erg): Conditional on us enabling touch on desktop linux builds, do 1013 // TODO(erg): Conditional on us enabling touch on desktop linux builds, do
1014 // the same tap-to-click disabling here that chromeos does. 1014 // the same tap-to-click disabling here that chromeos does.
1015 } 1015 }
1016 1016
1017 //////////////////////////////////////////////////////////////////////////////// 1017 ////////////////////////////////////////////////////////////////////////////////
1018 // DesktopWindowTreeHostX11, ui::EventSource implementation:
1019
1020 ui::EventProcessor* DesktopWindowTreeHostX11::GetEventProcessor() {
1021 return dispatcher();
1022 }
1023
1024 ////////////////////////////////////////////////////////////////////////////////
1025 // DesktopWindowTreeHostX11, private: 1018 // DesktopWindowTreeHostX11, private:
1026 1019
1027 void DesktopWindowTreeHostX11::InitX11Window( 1020 void DesktopWindowTreeHostX11::InitX11Window(
1028 const Widget::InitParams& params) { 1021 const Widget::InitParams& params) {
1029 unsigned long attribute_mask = CWBackPixmap; 1022 unsigned long attribute_mask = CWBackPixmap;
1030 XSetWindowAttributes swa; 1023 XSetWindowAttributes swa;
1031 memset(&swa, 0, sizeof(swa)); 1024 memset(&swa, 0, sizeof(swa));
1032 swa.background_pixmap = None; 1025 swa.background_pixmap = None;
1033 1026
1034 ::Atom window_type; 1027 ::Atom window_type;
(...skipping 964 matching lines...) Expand 10 before | Expand all | Expand 10 after
1999 if (linux_ui) { 1992 if (linux_ui) {
2000 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); 1993 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window);
2001 if (native_theme) 1994 if (native_theme)
2002 return native_theme; 1995 return native_theme;
2003 } 1996 }
2004 1997
2005 return ui::NativeTheme::instance(); 1998 return ui::NativeTheme::instance();
2006 } 1999 }
2007 2000
2008 } // namespace views 2001 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698