Implement ShellWindow in Views.

chrome/browser/extensions/platform_app_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/command_line.h"
 #include "chrome/browser/extensions/extension_browsertest.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 32 matching lines @@
 
 class PlatformAppBrowserTest : public ExtensionBrowserTest {
  public:
   virtual void SetUpCommandLine(CommandLine* command_line) {
     ExtensionBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kEnablePlatformApps);
   }
 
  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)));
 
     ExtensionService* service = browser()->profile()->GetExtensionService();
     const Extension* extension = service->GetExtensionById(
         last_loaded_extension_id_, false);
     EXPECT_TRUE(extension);
 
     size_t platform_app_count = GetPlatformAppCount();
 
     Browser::OpenApplication(
         browser()->profile(),
         extension,
         extension_misc::LAUNCH_SHELL,
         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());
   }
 
   // Gets the number of platform apps that are running.
   size_t GetPlatformAppCount() {
     int count = 0;
     ExtensionProcessManager* process_manager =
         browser()->profile()->GetExtensionProcessManager();
     ExtensionProcessManager::const_iterator iter;
@@ skipping 18 matching lines @@
          ++iter) {
       ExtensionHost* host = *iter;
       if (host->extension() && host->extension()->is_platform_app())
         return host->host_contents();
     }
 
     return NULL;
   }
 };
 
-// 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
 #endif
 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_OpenAppInShellContainer) {
   ASSERT_EQ(0u, GetPlatformAppCount());
   LoadAndLaunchPlatformApp("empty");
   ASSERT_EQ(1u, GetPlatformAppCount());
 
   UnloadExtension(last_loaded_extension_id_);
   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
 #endif
 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_EmptyContextMenu) {
   LoadAndLaunchPlatformApp("empty");
 
   // The empty app doesn't add any context menu items, so its menu should
   // be empty.
   WebContents* web_contents = GetFirstPlatformAppWebContents();
   ASSERT_TRUE(web_contents);
   WebKit::WebContextMenuData data;
   ContextMenuParams params(data);
   PlatformAppContextMenu* menu = new PlatformAppContextMenu(web_contents,
       params);
   menu->Init();
   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
 #endif
 IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest, MAYBE_AppWithContextMenu) {
   ExtensionTestMessageListener listener1("created item", false);
   LoadAndLaunchPlatformApp("context_menu");
 
   // Wait for the extension to tell us it's created an item.
   ASSERT_TRUE(listener1.WaitUntilSatisfied());
 
   // The context_menu app has one context menu item. This is all that should
   // be in the menu, there should be no seperator.
   WebContents* web_contents = GetFirstPlatformAppWebContents();
   ASSERT_TRUE(web_contents);
   WebKit::WebContextMenuData data;
   ContextMenuParams params(data);
   PlatformAppContextMenu* menu = new PlatformAppContextMenu(web_contents,
       params);
   menu->Init();
   ASSERT_EQ(1, menu->menu_model().GetItemCount());
 }