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

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: Fixes for sadrul 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 1829 matching lines...) Expand 10 before | Expand all | Expand 10 after
1840 // We don't have to communicate with an input method here. 1840 // We don't have to communicate with an input method here.
1841 if (!event->HasNativeEvent()) { 1841 if (!event->HasNativeEvent()) {
1842 NativeWebKeyboardEvent webkit_event( 1842 NativeWebKeyboardEvent webkit_event(
1843 event->type(), 1843 event->type(),
1844 event->is_char(), 1844 event->is_char(),
1845 event->is_char() ? event->GetCharacter() : event->key_code(), 1845 event->is_char() ? event->GetCharacter() : event->key_code(),
1846 event->flags(), 1846 event->flags(),
1847 ui::EventTimeForNow().InSecondsF()); 1847 ui::EventTimeForNow().InSecondsF());
1848 ForwardKeyboardEvent(webkit_event); 1848 ForwardKeyboardEvent(webkit_event);
1849 } else { 1849 } else {
1850 NativeWebKeyboardEvent webkit_event(event); 1850 NativeWebKeyboardEvent webkit_event(*event);
1851 ForwardKeyboardEvent(webkit_event); 1851 ForwardKeyboardEvent(webkit_event);
1852 } 1852 }
1853 } 1853 }
1854 event->SetHandled(); 1854 event->SetHandled();
1855 } 1855 }
1856 1856
1857 void RenderWidgetHostViewAura::OnMouseEvent(ui::MouseEvent* event) { 1857 void RenderWidgetHostViewAura::OnMouseEvent(ui::MouseEvent* event) {
1858 TRACE_EVENT0("input", "RenderWidgetHostViewAura::OnMouseEvent"); 1858 TRACE_EVENT0("input", "RenderWidgetHostViewAura::OnMouseEvent");
1859 1859
1860 if (touch_editing_client_ && touch_editing_client_->HandleInputEvent(event)) 1860 if (touch_editing_client_ && touch_editing_client_->HandleInputEvent(event))
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after
2574 2574
2575 //////////////////////////////////////////////////////////////////////////////// 2575 ////////////////////////////////////////////////////////////////////////////////
2576 // RenderWidgetHostViewBase, public: 2576 // RenderWidgetHostViewBase, public:
2577 2577
2578 // static 2578 // static
2579 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) { 2579 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
2580 GetScreenInfoForWindow(results, NULL); 2580 GetScreenInfoForWindow(results, NULL);
2581 } 2581 }
2582 2582
2583 } // namespace content 2583 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698