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

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

Issue 12087124: Disable touch calibration on external touchscreen. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix Win compilation take 2 + rebase Created 7 years, 10 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_root_window_host_linux.h" 5 #include "ui/views/widget/desktop_aura/desktop_root_window_host_linux.h"
6 6
7 #include <X11/extensions/XInput2.h> 7 #include <X11/extensions/XInput2.h>
8 #include <X11/Xatom.h> 8 #include <X11/Xatom.h>
9 #include <X11/Xutil.h> 9 #include <X11/Xutil.h>
10 10
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 native_widget_delegate_->OnNativeWidgetActivationChanged(active); 182 native_widget_delegate_->OnNativeWidgetActivationChanged(active);
183 native_widget_delegate_->AsWidget()->GetRootView()->SchedulePaint(); 183 native_widget_delegate_->AsWidget()->GetRootView()->SchedulePaint();
184 } 184 }
185 185
186 // TODO(erg): This method should basically be everything I need form 186 // TODO(erg): This method should basically be everything I need form
187 // RootWindowHostLinux::RootWindowHostLinux(). 187 // RootWindowHostLinux::RootWindowHostLinux().
188 aura::RootWindow* DesktopRootWindowHostLinux::InitRootWindow( 188 aura::RootWindow* DesktopRootWindowHostLinux::InitRootWindow(
189 const Widget::InitParams& params) { 189 const Widget::InitParams& params) {
190 bounds_ = params.bounds; 190 bounds_ = params.bounds;
191 191
192 aura::RootWindow::CreateParams rw_params(bounds_); 192 aura::RootWindow::CreateParams rw_params(bounds_, false);
193 rw_params.host = this; 193 rw_params.host = this;
194 root_window_ = new aura::RootWindow(rw_params); 194 root_window_ = new aura::RootWindow(rw_params);
195 root_window_->Init(); 195 root_window_->Init();
196 root_window_->AddChild(content_window_); 196 root_window_->AddChild(content_window_);
197 root_window_->SetLayoutManager(new DesktopLayoutManager(root_window_)); 197 root_window_->SetLayoutManager(new DesktopLayoutManager(root_window_));
198 root_window_->SetProperty(kViewsWindowForRootWindow, content_window_); 198 root_window_->SetProperty(kViewsWindowForRootWindow, content_window_);
199 root_window_->SetProperty(kHostForRootWindow, this); 199 root_window_->SetProperty(kHostForRootWindow, this);
200 root_window_host_delegate_ = root_window_; 200 root_window_host_delegate_ = root_window_;
201 201
202 // If we're given a parent, we need to mark ourselves as transient to another 202 // If we're given a parent, we need to mark ourselves as transient to another
(...skipping 875 matching lines...) Expand 10 before | Expand all | Expand 10 after
1078 DesktopRootWindowHost* DesktopRootWindowHost::Create( 1078 DesktopRootWindowHost* DesktopRootWindowHost::Create(
1079 internal::NativeWidgetDelegate* native_widget_delegate, 1079 internal::NativeWidgetDelegate* native_widget_delegate,
1080 DesktopNativeWidgetAura* desktop_native_widget_aura, 1080 DesktopNativeWidgetAura* desktop_native_widget_aura,
1081 const gfx::Rect& initial_bounds) { 1081 const gfx::Rect& initial_bounds) {
1082 return new DesktopRootWindowHostLinux(native_widget_delegate, 1082 return new DesktopRootWindowHostLinux(native_widget_delegate,
1083 desktop_native_widget_aura, 1083 desktop_native_widget_aura,
1084 initial_bounds); 1084 initial_bounds);
1085 } 1085 }
1086 1086
1087 } // namespace views 1087 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698