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

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

Issue 10436015: Remove chrome.windows.* support for platform apps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 6 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
Index: chrome/browser/extensions/platform_app_browsertest.cc
diff --git a/chrome/browser/extensions/platform_app_browsertest.cc b/chrome/browser/extensions/platform_app_browsertest.cc
index 748090eeaa1d4010c4eda7276173c880269da896..fbb99a44ca0be5b8b99035652bfc7b2f9e8c9112 100644
--- a/chrome/browser/extensions/platform_app_browsertest.cc
+++ b/chrome/browser/extensions/platform_app_browsertest.cc
@@ -150,7 +150,7 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, ExtensionWindowingApis) {
// Launch a platform app that shows a window.
ExtensionTestMessageListener launched_listener("Launched", false);
- const Extension* platform_app = LoadAndLaunchPlatformApp("minimal");
+ LoadAndLaunchPlatformApp("minimal");
ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
ASSERT_EQ(1U, GetShellWindowCount());
ShellWindowRegistry::ShellWindowSet shell_windows =
@@ -164,18 +164,17 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, ExtensionWindowingApis) {
ASSERT_FALSE(RunGetWindowFunctionForExtension(shell_window_id, extension));
// The app can also only see one window (its own).
- ASSERT_EQ(1U, RunGetWindowsFunctionForExtension(platform_app));
- ASSERT_TRUE(RunGetWindowFunctionForExtension(shell_window_id, platform_app));
+ // TODO(jeremya): add an extension function to get a shell window by ID, and
+ // to get a list of all the shell windows, so we can test this.
// Launch another platform app that also shows a window.
ExtensionTestMessageListener launched_listener2("Launched", false);
- const Extension* platform_app2 = LoadAndLaunchPlatformApp("context_menu");
+ LoadAndLaunchPlatformApp("context_menu");
ASSERT_TRUE(launched_listener2.WaitUntilSatisfied());
// There are two total shell windows, but each app can only see its own.
ASSERT_EQ(2U, GetShellWindowCount());
- ASSERT_EQ(1U, RunGetWindowsFunctionForExtension(platform_app));
- ASSERT_EQ(1U, RunGetWindowsFunctionForExtension(platform_app2));
+ // TODO(jeremya): as above, this requires more extension functions.
}
// TODO(benwells): fix these tests for ChromeOS.
« no previous file with comments | « chrome/browser/extensions/extension_tabs_module_constants.cc ('k') | chrome/browser/ui/extensions/shell_window.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698