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

Unified Diff: chrome/browser/extensions/api/management/management_apitest.cc

Issue 10836301: Make apps with launch container type panel open as popups. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Synced Created 8 years, 4 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
« no previous file with comments | « no previous file | chrome/browser/ui/extensions/application_launch.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/api/management/management_apitest.cc
diff --git a/chrome/browser/extensions/api/management/management_apitest.cc b/chrome/browser/extensions/api/management/management_apitest.cc
index 51df33f0d9c05a0a17757f583a622900507a24e4..bd2f8719372723bf89c4c8eedbd81808d5a0f9fd 100644
--- a/chrome/browser/extensions/api/management/management_apitest.cc
+++ b/chrome/browser/extensions/api/management/management_apitest.cc
@@ -165,10 +165,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, LaunchPanelApp) {
LoadAndWaitForLaunch("management/launch_app_panel", &app_id);
ASSERT_FALSE(HasFatalFailure()); // Stop the test if any ASSERT failed.
- // Find the app's browser. Check that it is a panel.
+ // Find the app's browser. Check that it is a popup.
ASSERT_EQ(2u, browser::GetBrowserCount(browser()->profile()));
Browser* app_browser = FindOtherBrowser(browser());
- ASSERT_TRUE(app_browser->is_type_panel());
+ ASSERT_TRUE(app_browser->is_type_popup());
ASSERT_TRUE(app_browser->is_app());
// Close the app panel.
@@ -185,7 +185,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, LaunchPanelApp) {
ASSERT_FALSE(service->GetExtensionById(app_id, true));
// Set a pref indicating that the user wants to launch in a regular tab.
- // This should be ignored, because panel apps always load in a panel.
+ // This should be ignored, because panel apps always load in a popup.
service->extension_prefs()->SetLaunchType(
app_id, extensions::ExtensionPrefs::LAUNCH_REGULAR);
@@ -198,10 +198,10 @@ IN_PROC_BROWSER_TEST_F(ExtensionManagementApiTest, LaunchPanelApp) {
ASSERT_EQ(app_id, app_id_new);
// Find the app's browser. Apps that should load in a panel ignore
- // prefs, so we should still see the launch in a panel.
+ // prefs, so we should still see the launch in a popup.
ASSERT_EQ(2u, browser::GetBrowserCount(browser()->profile()));
app_browser = FindOtherBrowser(browser());
- ASSERT_TRUE(app_browser->is_type_panel());
+ ASSERT_TRUE(app_browser->is_type_popup());
ASSERT_TRUE(app_browser->is_app());
}
« no previous file with comments | « no previous file | chrome/browser/ui/extensions/application_launch.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698