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

Unified Diff: chrome/browser/ui/browser_init_browsertest.cc

Issue 8572022: aura: Fix BrowserInitTest.OpenAppShortcutPanel. (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
« chrome/browser/ui/browser.cc ('K') | « chrome/browser/ui/browser.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/browser_init_browsertest.cc
diff --git a/chrome/browser/ui/browser_init_browsertest.cc b/chrome/browser/ui/browser_init_browsertest.cc
index 91ab75ac24174dd253853d2ee115e8a2a2e5cf6d..30d79555b9609c7f1472cb9e302a4a9258b98cf8 100644
--- a/chrome/browser/ui/browser_init_browsertest.cc
+++ b/chrome/browser/ui/browser_init_browsertest.cc
@@ -289,7 +289,12 @@ IN_PROC_BROWSER_TEST_F(BrowserInitTest, OpenAppShortcutPanel) {
ASSERT_NO_FATAL_FAILURE(FindOneOtherBrowser(&new_browser));
// Expect an app panel.
+#if defined(USE_AURA)
+ // In aura, apps open in popup windows.
+ EXPECT_TRUE(new_browser->is_type_popup() && new_browser->is_app());
+#else
EXPECT_TRUE(new_browser->is_type_panel() && new_browser->is_app());
+#endif
// The new browser's app_name should include the app's ID.
EXPECT_NE(
« chrome/browser/ui/browser.cc ('K') | « chrome/browser/ui/browser.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698