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

Unified Diff: content/test/render_view_test.cc

Issue 8463025: Get BrowserTests to compile on windows with aura. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/render_view_test.cc
===================================================================
--- content/test/render_view_test.cc (revision 109708)
+++ content/test/render_view_test.cc (working copy)
@@ -158,7 +158,10 @@
int key_code,
MockKeyboard::Modifiers modifiers,
std::wstring* output) {
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+ NOTIMPLEMENTED();
+ return L'\0';
+#elif defined(OS_WIN)
// Retrieve the Unicode character for the given tuple (keyboard-layout,
// key-code, and modifiers).
// Exit when a keyboard-layout driver cannot assign a Unicode character to
@@ -189,7 +192,7 @@
SendNativeKeyEvent(keyup_event);
return length;
-#elif defined(OS_LINUX) && !defined(USE_AURA)
+#elif defined(OS_LINUX)
// 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 | « chrome/browser/ui/views/tab_contents/native_tab_contents_view_aura.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698