Rename apps::ShellWindow to apps::AppWindow

chrome/browser/apps/web_view_interactive_browsertest.cc

 // Copyright 2013 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 "apps/shell_window.h"
-#include "apps/shell_window_registry.h"
+#include "apps/app_window.h"
+#include "apps/app_window_registry.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/apps/app_browsertest_util.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tab_contents/render_view_context_menu_browsertest_util.h"
 #include "chrome/browser/tab_contents/render_view_context_menu_test_util.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/test_launcher_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "ui/base/test/ui_controls.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 
-using apps::ShellWindow;
+using apps::AppWindow;
 
 class WebViewInteractiveTest
     : public extensions::PlatformAppBrowserTest {
  public:
   WebViewInteractiveTest()
       : corner_(gfx::Point()),
         mouse_click_result_(false),
         first_click_(true) {}
 
   void MoveMouseInsideWindowWithListener(gfx::Point point,
@@ skipping 15 matching lines @@
     SendMouseEvent(button, ui_controls::DOWN);
     SendMouseEvent(button, ui_controls::UP);
   }
 
   void MoveMouseInsideWindow(const gfx::Point& point) {
     ASSERT_TRUE(ui_test_utils::SendMouseMoveSync(
         gfx::Point(corner_.x() + point.x(), corner_.y() + point.y())));
   }
 
   gfx::NativeWindow GetPlatformAppWindow() {
-    const apps::ShellWindowRegistry::ShellWindowList& shell_windows =
-        apps::ShellWindowRegistry::Get(
-            browser()->profile())->shell_windows();
-    return (*shell_windows.begin())->GetNativeWindow();
+    const apps::AppWindowRegistry::AppWindowList& app_windows =
+        apps::AppWindowRegistry::Get(browser()->profile())->app_windows();
+    return (*app_windows.begin())->GetNativeWindow();
   }
 
   void SendKeyPressToPlatformApp(ui::KeyboardCode key) {
-    ASSERT_EQ(1U, GetShellWindowCount());
+    ASSERT_EQ(1U, GetAppWindowCount());
     ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync(
         GetPlatformAppWindow(), key, false, false, false, false));
   }
 
   void SendCopyKeyPressToPlatformApp() {
-    ASSERT_EQ(1U, GetShellWindowCount());
+    ASSERT_EQ(1U, GetAppWindowCount());
 #if defined(OS_MACOSX)
     // Send Cmd+C on MacOSX.
     ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync(
         GetPlatformAppWindow(), ui::VKEY_C, false, false, false, true));
 #else
     // Send Ctrl+C on Windows and Linux/ChromeOS.
     ASSERT_TRUE(ui_test_utils::SendKeyPressToWindowSync(
         GetPlatformAppWindow(), ui::VKEY_C, true, false, false, false));
 #endif
   }
@@ skipping 72 matching lines @@
     }
 
     if (!ui_test_utils::ShowAndFocusNativeWindow(GetPlatformAppWindow())) {
       LOG(ERROR) << "UNABLE TO FOCUS TEST WINDOW.";
       return scoped_ptr<ExtensionTestMessageListener>();
     }
 
     // Flush any pending events to make sure we start with a clean slate.
     content::RunAllPendingInMessageLoop();
 
-    *embedder_web_contents = GetFirstShellWindowWebContents();
+    *embedder_web_contents = GetFirstAppWindowWebContents();
 
     scoped_ptr<ExtensionTestMessageListener> done_listener(
         new ExtensionTestMessageListener("TEST_PASSED", false));
     done_listener->AlsoListenForFailureMessage("TEST_FAILED");
     if (!content::ExecuteScript(
             *embedder_web_contents,
             base::StringPrintf("runTest('%s')", test_name.c_str()))) {
       LOG(ERROR) << "UNABLE TO START TEST";
       return scoped_ptr<ExtensionTestMessageListener>();
     }
@@ skipping 146 matching lines @@
     title_watcher.AlsoWaitForTitle(error_title);
     EXPECT_TRUE(content::ExecuteScript(guest_web_contents(),
                                        "changeTitle();"));
     ASSERT_EQ(expected_title, title_watcher.WaitAndGetTitle());
 
     gfx::Rect popup_bounds = popup_rwh->GetView()->GetViewBounds();
     // (2, 2) is expected to lie on the first datalist element.
     SimulateRWHMouseClick(popup_rwh, blink::WebMouseEvent::ButtonLeft, 2, 2);
 
     content::RenderViewHost* embedder_rvh =
-        GetFirstShellWindowWebContents()->GetRenderViewHost();
+        GetFirstAppWindowWebContents()->GetRenderViewHost();
     gfx::Rect embedder_bounds = embedder_rvh->GetView()->GetViewBounds();
     gfx::Vector2d diff = popup_bounds.origin() - embedder_bounds.origin();
     LOG(INFO) << "DIFF: x = " << diff.x() << ", y = " << diff.y();
 
     const int left_spacing = 40 + padding.x();  // div.style.paddingLeft = 40px.
     // div.style.paddingTop = 50px + (input box height = 26px).
     const int top_spacing = 50 + 26 + padding.y();
 
     // If the popup is placed within |threshold_px| of the expected position,
     // then we consider the test as a pass.
@@ skipping 35 matching lines @@
 
     quit_closure_.Run();
 
     // Note that following ExtensionTestMessageListener and ExecuteScript*
     // call must be after we quit |quit_closure_|. Otherwise the class
     // here won't be able to receive messages sent by chrome.test.sendMessage.
     // This is because of the nature of drag and drop code (esp. the
     // MessageLoop) in it.
 
     // Now check if we got a drop and read the drop data.
-    embedder_web_contents_ = GetFirstShellWindowWebContents();
+    embedder_web_contents_ = GetFirstAppWindowWebContents();
     ExtensionTestMessageListener drop_listener("guest-got-drop", false);
     EXPECT_TRUE(content::ExecuteScript(embedder_web_contents_,
                                        "window.checkIfGuestGotDrop()"));
     EXPECT_TRUE(drop_listener.WaitUntilSatisfied());
 
     std::string last_drop_data;
     EXPECT_TRUE(content::ExecuteScriptAndExtractString(
                     embedder_web_contents_,
                     "window.domAutomationController.send(getLastDropData())",
                     &last_drop_data));
@@ skipping 275 matching lines @@
 // of simulating mouse drag code's dependency on platforms.
 #if defined(OS_CHROMEOS)
 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, DragDropWithinWebView) {
   ExtensionTestMessageListener guest_connected_listener("connected", false);
   LoadAndLaunchPlatformApp("web_view/dnd_within_webview");
   ASSERT_TRUE(guest_connected_listener.WaitUntilSatisfied());
 
   ASSERT_TRUE(ui_test_utils::ShowAndFocusNativeWindow(GetPlatformAppWindow()));
 
   gfx::Rect offset;
-  embedder_web_contents_ = GetFirstShellWindowWebContents();
+  embedder_web_contents_ = GetFirstAppWindowWebContents();
   embedder_web_contents_->GetView()->GetContainerBounds(&offset);
   corner_ = gfx::Point(offset.x(), offset.y());
 
   // In the drag drop test we add 20px padding to the page body because on
   // windows if we get too close to the edge of the window the resize cursor
   // appears and we start dragging the window edge.
   corner_.Offset(20, 20);
 
   // Flush any pending events to make sure we start with a clean slate.
   content::RunAllPendingInMessageLoop();
@@ skipping 28 matching lines @@
 IN_PROC_BROWSER_TEST_F(WebViewInteractiveTest, Navigation_BackForwardKeys) {
   ExtensionTestMessageListener launched_listener("Launched", false);
   LoadAndLaunchPlatformApp("web_view/navigation");
   ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
 
   ASSERT_TRUE(ui_test_utils::ShowAndFocusNativeWindow(
       GetPlatformAppWindow()));
   // Flush any pending events to make sure we start with a clean slate.
   content::RunAllPendingInMessageLoop();
 
-  content::WebContents* embedder_web_contents =
-      GetFirstShellWindowWebContents();
+  content::WebContents* embedder_web_contents = GetFirstAppWindowWebContents();
   ASSERT_TRUE(embedder_web_contents);
 
   ExtensionTestMessageListener done_listener(
       "TEST_PASSED", false);
   done_listener.AlsoListenForFailureMessage("TEST_FAILED");
   ExtensionTestMessageListener ready_back_key_listener(
       "ReadyForBackKey", false);
   ExtensionTestMessageListener ready_forward_key_listener(
       "ReadyForForwardKey", false);
 
@@ skipping 34 matching lines @@
 
   // Now verify that the selection text propagates properly to RWHV.
   content::RenderWidgetHostView* guest_rwhv =
       guest_web_contents()->GetRenderWidgetHostView();
   ASSERT_TRUE(guest_rwhv);
   std::string selected_text = base::UTF16ToUTF8(guest_rwhv->GetSelectedText());
   ASSERT_TRUE(selected_text.size() >= 10u);
   ASSERT_EQ("AAAAAAAAAA", selected_text.substr(0, 10));
 }
 #endif