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

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

Issue 739993002: MacViews: Fix build errors related to NativeWebKeyboardEvent (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
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 1833 matching lines...) Expand 10 before | Expand all | Expand 10 after
1844 // We don't have to communicate with an input method here. 1844 // We don't have to communicate with an input method here.
1845 if (!event->HasNativeEvent()) { 1845 if (!event->HasNativeEvent()) {
1846 NativeWebKeyboardEvent webkit_event( 1846 NativeWebKeyboardEvent webkit_event(
1847 event->type(), 1847 event->type(),
1848 event->is_char(), 1848 event->is_char(),
1849 event->is_char() ? event->GetCharacter() : event->key_code(), 1849 event->is_char() ? event->GetCharacter() : event->key_code(),
1850 event->flags(), 1850 event->flags(),
1851 ui::EventTimeForNow().InSecondsF()); 1851 ui::EventTimeForNow().InSecondsF());
1852 ForwardKeyboardEvent(webkit_event); 1852 ForwardKeyboardEvent(webkit_event);
1853 } else { 1853 } else {
1854 NativeWebKeyboardEvent webkit_event(event); 1854 NativeWebKeyboardEvent webkit_event(*event);
1855 ForwardKeyboardEvent(webkit_event); 1855 ForwardKeyboardEvent(webkit_event);
1856 } 1856 }
1857 } 1857 }
1858 event->SetHandled(); 1858 event->SetHandled();
1859 } 1859 }
1860 1860
1861 void RenderWidgetHostViewAura::OnMouseEvent(ui::MouseEvent* event) { 1861 void RenderWidgetHostViewAura::OnMouseEvent(ui::MouseEvent* event) {
1862 TRACE_EVENT0("input", "RenderWidgetHostViewAura::OnMouseEvent"); 1862 TRACE_EVENT0("input", "RenderWidgetHostViewAura::OnMouseEvent");
1863 1863
1864 if (touch_editing_client_ && touch_editing_client_->HandleInputEvent(event)) 1864 if (touch_editing_client_ && touch_editing_client_->HandleInputEvent(event))
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after
2578 2578
2579 //////////////////////////////////////////////////////////////////////////////// 2579 ////////////////////////////////////////////////////////////////////////////////
2580 // RenderWidgetHostViewBase, public: 2580 // RenderWidgetHostViewBase, public:
2581 2581
2582 // static 2582 // static
2583 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { 2583 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
2584 GetScreenInfoForWindow(results, NULL); 2584 GetScreenInfoForWindow(results, NULL);
2585 } 2585 }
2586 2586
2587 } // namespace content 2587 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698