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

Unified Diff: extensions/shell/browser/shell_browsertest.cc

Issue 745093002: AppShell support for Mac. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: minors Created 6 years 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: extensions/shell/browser/shell_browsertest.cc
diff --git a/extensions/shell/browser/shell_browsertest.cc b/extensions/shell/browser/shell_browsertest.cc
index 407e417f0de1cdc1424662a1453e16b8f8e7df51..baf75d9f712243084a201aa9655871c52a371e12 100644
--- a/extensions/shell/browser/shell_browsertest.cc
+++ b/extensions/shell/browser/shell_browsertest.cc
@@ -10,7 +10,10 @@
#include "extensions/browser/app_window/app_window_registry.h"
#include "extensions/browser/notification_types.h"
#include "extensions/shell/test/shell_apitest.h"
+
+#if defined(USE_AURA)
#include "ui/aura/window.h"
+#endif
namespace extensions {
@@ -23,8 +26,13 @@ IN_PROC_BROWSER_TEST_F(ShellApiTest, Basic) {
AppWindowRegistry::Get(browser_context())->app_windows().front();
ASSERT_TRUE(app_window);
+ // TOOD(yoz): Test for focus on Cocoa.
+ // app_window->GetBaseWindow()->IsActive() is possible, although on Mac,
+ // focus changes are asynchronous, so interactive_ui_tests are required.
+#if defined(USE_AURA)
// The web contents have focus.
EXPECT_TRUE(app_window->web_contents()->GetContentNativeView()->HasFocus());
+#endif
}
} // namespace extensions
« no previous file with comments | « extensions/shell/browser/shell_browser_main_parts_mac.mm ('k') | extensions/shell/browser/shell_desktop_controller_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698