content/browser/renderer_host/render_widget_host_view_mac_unittest.mm - Issue 2240983003: Move |ScopedWebInputEvent| and |WebInputEventTraits| from |content::| to "ui/events/blink"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

Patch Set: Rebase and ncarter's review Created 4 years, 4 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/browser/renderer_host/render_widget_host_view_aura_unittest.cc ('k') | content/browser/web_contents/web_contents_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

diff --git a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

index b4eecea318e93a82317a96f56240090d31a7d047..8d4c9f09900a67b1242f2e2c6c62008d7971386f 100644

--- a/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

+++ b/content/browser/renderer_host/render_widget_host_view_mac_unittest.mm

@@ -23,7 +23,6 @@

#include "content/browser/gpu/compositor_util.h"

#include "content/browser/renderer_host/render_widget_host_delegate.h"

#include "content/browser/renderer_host/text_input_manager.h"

-#include "content/common/input/web_input_event_traits.h"

#include "content/common/input_messages.h"

#include "content/common/text_input_state.h"

#include "content/common/view_messages.h"

@@ -41,6 +40,7 @@

#import "third_party/ocmock/OCMock/OCMock.h"

#import "third_party/ocmock/ocmock_extensions.h"

#include "ui/events/base_event_utils.h"

+#include "ui/events/blink/web_input_event_traits.h"

#include "ui/events/latency_info.h"

#include "ui/events/test/cocoa_test_event_utils.h"

#import "ui/gfx/test/ui_cocoa_test_helper.h"

@@ -115,7 +115,7 @@ std::string GetInputMessageTypes(MockRenderProcessHost* process) {

const blink::WebInputEvent* event = std::get<0>(params);

if (i != 0)

result += " ";

- result += WebInputEventTraits::GetName(event->type);

+ result += ui::WebInputEventTraits::GetName(event->type);

}

process->sink().ClearMessages();

return result;