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

Side by Side Diff: chrome/browser/renderer_host/render_widget_host_view_views_touch.cc

Issue 8566011: Completes the GetWindowRect/GetRootWindowRect/GetScreenInfo changes I thought I had finished with... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "chrome/browser/renderer_host/render_widget_host_view_views.h" 5 #include "chrome/browser/renderer_host/render_widget_host_view_views.h"
6 6
7 #include <gdk/gdkx.h>
8 #include <gtk/gtk.h>
9
7 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "content/browser/renderer_host/gtk_window_utils.h"
8 #include "content/browser/renderer_host/render_widget_host.h" 12 #include "content/browser/renderer_host/render_widget_host.h"
9 #include "third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFact ory.h" 13 #include "third_party/WebKit/Source/WebKit/chromium/public/gtk/WebInputEventFact ory.h"
14 #include "third_party/WebKit/Source/WebKit/chromium/public/WebScreenInfo.h"
10 #include "views/widget/widget.h" 15 #include "views/widget/widget.h"
11 16
12 static const char kRenderWidgetHostViewKey[] = "__RENDER_WIDGET_HOST_VIEW__"; 17 static const char kRenderWidgetHostViewKey[] = "__RENDER_WIDGET_HOST_VIEW__";
13 18
14 using WebKit::WebInputEventFactory; 19 using WebKit::WebInputEventFactory;
15 using WebKit::WebTouchEvent; 20 using WebKit::WebTouchEvent;
16 21
17 namespace { 22 namespace {
18 23
19 WebKit::WebTouchPoint::State TouchPointStateFromEvent( 24 WebKit::WebTouchPoint::State TouchPointStateFromEvent(
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 touch_event_.touches[i] = touch_event_.touches[i + 1]; 169 touch_event_.touches[i] = touch_event_.touches[i + 1];
165 } 170 }
166 if (touch_event_.touchesLength == 0) 171 if (touch_event_.touchesLength == 0)
167 status = ui::TOUCH_STATUS_END; 172 status = ui::TOUCH_STATUS_END;
168 } else if (event.type() == ui::ET_TOUCH_CANCELLED) { 173 } else if (event.type() == ui::ET_TOUCH_CANCELLED) {
169 status = ui::TOUCH_STATUS_CANCEL; 174 status = ui::TOUCH_STATUS_CANCEL;
170 } 175 }
171 176
172 return status; 177 return status;
173 } 178 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698