chrome/test/base/render_view_test.cc - Issue 8190012: make browser_tests and interaction_ui_tests compile and link under use_aura=1 chromeos=0.

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: chrome/test/base/render_view_test.cc

Issue 8190012: make browser_tests and interaction_ui_tests compile and link under use_aura=1 chromeos=0. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: merge clipboard change. Created 9 years, 2 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

Index: chrome/test/base/render_view_test.cc

diff --git a/chrome/test/base/render_view_test.cc b/chrome/test/base/render_view_test.cc

index efc05a8c62561a9096b245d105e4d46382ad4953..9cda3c7be252a4968f1c03e4d2e175d6f94f8552 100644

--- a/chrome/test/base/render_view_test.cc

+++ b/chrome/test/base/render_view_test.cc

@@ -31,7 +31,7 @@

#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"

#include "webkit/glue/webkit_glue.h"

-#if defined(OS_LINUX)

+#if defined(OS_LINUX) && !defined(USE_AURA)

#include "ui/base/gtk/event_synthesis_gtk.h"

#endif

@@ -211,7 +211,7 @@ int RenderViewTest::SendKeyEvent(MockKeyboard::Layout layout,

SendNativeKeyEvent(keyup_event);

return length;

-#elif defined(OS_LINUX)

+#elif defined(OS_LINUX) && !defined(USE_AURA)

// We ignore |layout|, which means we are only testing the layout of the

// current locale. TODO(estade): fix this to respect |layout|.

std::vector<GdkEvent*> events;

« no previous file with comments | « no previous file | chrome/test/base/ui_test_utils_linux.cc » ('j') | no next file with comments »