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

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: fixed bot failure: cast_shell_linux 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 1047 matching lines...) Expand 10 before | Expand all | Expand 10 after
1058 bounds_in_pixels_.x() + location.x(), 1058 bounds_in_pixels_.x() + location.x(),
1059 bounds_in_pixels_.y() + location.y()); 1059 bounds_in_pixels_.y() + location.y());
1060 } 1060 }
1061 1061
1062 void DesktopWindowTreeHostX11::OnCursorVisibilityChangedNative(bool show) { 1062 void DesktopWindowTreeHostX11::OnCursorVisibilityChangedNative(bool show) {
1063 // TODO(erg): Conditional on us enabling touch on desktop linux builds, do 1063 // TODO(erg): Conditional on us enabling touch on desktop linux builds, do
1064 // the same tap-to-click disabling here that chromeos does. 1064 // the same tap-to-click disabling here that chromeos does.
1065 } 1065 }
1066 1066
1067 //////////////////////////////////////////////////////////////////////////////// 1067 ////////////////////////////////////////////////////////////////////////////////
1068 // DesktopWindowTreeHostX11, ui::EventSource implementation:
1069
1070 ui::EventProcessor* DesktopWindowTreeHostX11::GetEventProcessor() {
1071 return dispatcher();
1072 }
1073
1074 ////////////////////////////////////////////////////////////////////////////////
1075 // DesktopWindowTreeHostX11, private: 1068 // DesktopWindowTreeHostX11, private:
1076 1069
1077 void DesktopWindowTreeHostX11::InitX11Window( 1070 void DesktopWindowTreeHostX11::InitX11Window(
1078 const Widget::InitParams& params) { 1071 const Widget::InitParams& params) {
1079 unsigned long attribute_mask = CWBackPixmap; 1072 unsigned long attribute_mask = CWBackPixmap;
1080 XSetWindowAttributes swa; 1073 XSetWindowAttributes swa;
1081 memset(&swa, 0, sizeof(swa)); 1074 memset(&swa, 0, sizeof(swa));
1082 swa.background_pixmap = None; 1075 swa.background_pixmap = None;
1083 1076
1084 ::Atom window_type; 1077 ::Atom window_type;
(...skipping 964 matching lines...) Expand 10 before | Expand all | Expand 10 after
2049 if (linux_ui) { 2042 if (linux_ui) {
2050 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window); 2043 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(window);
2051 if (native_theme) 2044 if (native_theme)
2052 return native_theme; 2045 return native_theme;
2053 } 2046 }
2054 2047
2055 return ui::NativeTheme::instance(); 2048 return ui::NativeTheme::instance();
2056 } 2049 }
2057 2050
2058 } // namespace views 2051 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698