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

Side by Side Diff: content/browser/renderer_host/render_widget_host_view_aura.cc

Issue 240333007: wip: Second crack at implementing the touch exploration mode. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Don't extend DisplayController::Observer - TouchExplorationController is owned by the root window (… Created 6 years, 8 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 "content/browser/renderer_host/render_widget_host_view_aura.h" 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
(...skipping 2391 matching lines...) Expand 10 before | Expand all | Expand 10 after
2402 } else { 2402 } else {
2403 NativeWebKeyboardEvent webkit_event(event); 2403 NativeWebKeyboardEvent webkit_event(event);
2404 ForwardKeyboardEvent(webkit_event); 2404 ForwardKeyboardEvent(webkit_event);
2405 } 2405 }
2406 } 2406 }
2407 event->SetHandled(); 2407 event->SetHandled();
2408 } 2408 }
2409 2409
2410 void RenderWidgetHostViewAura::OnMouseEvent(ui::MouseEvent* event) { 2410 void RenderWidgetHostViewAura::OnMouseEvent(ui::MouseEvent* event) {
2411 TRACE_EVENT0("input", "RenderWidgetHostViewAura::OnMouseEvent"); 2411 TRACE_EVENT0("input", "RenderWidgetHostViewAura::OnMouseEvent");
2412 LOG(ERROR) << "RenderWidgetHostViewAura::OnMouseEvent";
Daniel Erat 2014/04/18 00:44:08 delete
2412 2413
2413 if (touch_editing_client_ && touch_editing_client_->HandleInputEvent(event)) 2414 if (touch_editing_client_ && touch_editing_client_->HandleInputEvent(event))
2414 return; 2415 return;
2415 2416
2416 if (mouse_locked_) { 2417 if (mouse_locked_) {
2417 aura::client::CursorClient* cursor_client = 2418 aura::client::CursorClient* cursor_client =
2418 aura::client::GetCursorClient(window_->GetRootWindow()); 2419 aura::client::GetCursorClient(window_->GetRootWindow());
2419 DCHECK(!cursor_client || !cursor_client->IsCursorVisible()); 2420 DCHECK(!cursor_client || !cursor_client->IsCursorVisible());
2420 2421
2421 if (event->type() == ui::ET_MOUSEWHEEL) { 2422 if (event->type() == ui::ET_MOUSEWHEEL) {
(...skipping 793 matching lines...) Expand 10 before | Expand all | Expand 10 after
3215 RenderWidgetHost* widget) { 3216 RenderWidgetHost* widget) {
3216 return new RenderWidgetHostViewAura(widget); 3217 return new RenderWidgetHostViewAura(widget);
3217 } 3218 }
3218 3219
3219 // static 3220 // static
3220 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { 3221 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) {
3221 GetScreenInfoForWindow(results, NULL); 3222 GetScreenInfoForWindow(results, NULL);
3222 } 3223 }
3223 3224
3224 } // namespace content 3225 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698