Implement ShellWindow in Views.

chrome/browser/extensions/platform_app_browsertest.cc

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 81270a943d8f381156a273838665278f0d82d247..22bc98365ab72071e9fe6638284687d4d1e4a11b 100644
--- a/chrome/browser/extensions/platform_app_browsertest.cc
+++ b/chrome/browser/extensions/platform_app_browsertest.cc
@@ -50,6 +50,10 @@ class PlatformAppBrowserTest : public ExtensionBrowserTest {
 
  protected:
   void LoadAndLaunchPlatformApp(const char* name) {
+    ui_test_utils::WindowedNotificationObserver popup_observer(

[Mihai Parparita -not on Chrome, 2012/01/12 23:37:08]

Calling this app_loaded_observer is probably more appropriate than
popup_observer.

[jeremya, 2012/01/12 23:38:45]

Done.

+        content::NOTIFICATION_LOAD_COMPLETED_MAIN_FRAME,
+        content::NotificationService::AllSources());
+
     web_app::SetDisableShortcutCreationForTests(true);
     EXPECT_TRUE(LoadExtension(test_data_dir_.AppendASCII("platform_apps").
         AppendASCII(name)));
@@ -68,6 +72,8 @@ class PlatformAppBrowserTest : public ExtensionBrowserTest {
         GURL(),
         NEW_WINDOW);
 
+  popup_observer.Wait();

[Mihai Parparita -not on Chrome, 2012/01/12 23:37:08]

Indentation seems off here.

[jeremya, 2012/01/12 23:38:45]

Done.

+
     // Now we have a new platform app running.
     EXPECT_EQ(platform_app_count + 1, GetPlatformAppCount());
   }
@@ -106,8 +112,8 @@ class PlatformAppBrowserTest : public ExtensionBrowserTest {
   }
 };
 
-// Disabled until shell windows are implemented for non-GTK toolkits.
-#if defined(TOOLKIT_GTK)
+// Disabled until shell windows are implemented for non-GTK, non-Views toolkits.
+#if defined(TOOLKIT_GTK) | defined(TOOLKIT_VIEWS)

[Ben Goodger (Google), 2012/01/12 23:42:38]

Convention is to do double pipe || or.

[jeremya, 2012/01/12 23:48:52]

Done.

 #define MAYBE_OpenAppInShellContainer OpenAppInShellContainer
 #else
 #define MAYBE_OpenAppInShellContainer DISABLED_OpenAppInShellContainer
@@ -121,8 +127,8 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_OpenAppInShellContainer) {
   ASSERT_EQ(0u, GetPlatformAppCount());
 }
 
-// Disabled until shell windows are implemented for non-GTK toolkits.
-#if defined(TOOLKIT_GTK)
+// Disabled until shell windows are implemented for non-GTK, non-Views toolkits.
+#if defined(TOOLKIT_GTK) | defined(TOOLKIT_VIEWS)
 #define MAYBE_EmptyContextMenu EmptyContextMenu
 #else
 #define MAYBE_EmptyContextMenu DISABLED_EmptyContextMenu
@@ -142,8 +148,8 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_EmptyContextMenu) {
   ASSERT_FALSE(menu->menu_model().GetItemCount());
 }
 
-// Disabled until shell windows are implemented for non-GTK toolkits.
-#if defined(TOOLKIT_GTK)
+// Disabled until shell windows are implemented for non-GTK, non-Views toolkits.
+#if defined(TOOLKIT_GTK) | defined(TOOLKIT_VIEWS)
 #define MAYBE_AppWithContextMenu AppWithContextMenu
 #else
 #define MAYBE_AppWithContextMenu DISABLED_AppWithContextMenu