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

Unified Diff: chrome/browser/extensions/extension_clipboard_apitest.cc

Issue 8540031: Disable selection on aura. Clipboard semantics on aura must be same as windows (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/extensions/extension_clipboard_api.cc ('k') | ui/base/clipboard/clipboard.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/extension_clipboard_apitest.cc
diff --git a/chrome/browser/extensions/extension_clipboard_apitest.cc b/chrome/browser/extensions/extension_clipboard_apitest.cc
index ebcdfedc507a85730d4a05de56d7ba7ca63aa3f8..86a850fed6688cce0f23c9dd93cb3be00bd4fa03 100644
--- a/chrome/browser/extensions/extension_clipboard_apitest.cc
+++ b/chrome/browser/extensions/extension_clipboard_apitest.cc
@@ -16,15 +16,13 @@ class ExtensionClipboardApiTest : public ExtensionApiTest {
};
IN_PROC_BROWSER_TEST_F(ExtensionClipboardApiTest, WriteAndReadTest) {
-#if defined(OS_WIN)
+#if defined(OS_WIN) || defined(USE_AURA)
ASSERT_TRUE(RunExtensionTest("clipboard_api/extension_win")) << message_;
-#else // !defined(OS_WIN)
-#if defined(OS_MACOSX)
+#elif defined(OS_MACOSX)
ASSERT_TRUE(RunExtensionTest("clipboard_api/extension_mac")) << message_;
-#else // !defined(OS_WIN) && !defined(OS_MACOSX)
+#else // !defined(OS_WIN) && !defined(OS_MACOSX) && !defined(USE_AURA)
ASSERT_TRUE(RunExtensionTest("clipboard_api/extension")) << message_;
-#endif // defined(OS_MACOSX)
-#endif // defiend(OS_WIN)
+#endif
};
IN_PROC_BROWSER_TEST_F(ExtensionClipboardApiTest, NoPermission) {
« no previous file with comments | « chrome/browser/extensions/extension_clipboard_api.cc ('k') | ui/base/clipboard/clipboard.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698