Rename apps::ShellWindow to apps::AppWindow

chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.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 "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 29 matching lines @@
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest_constants.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/models/menu_model.h"
 
 #if defined(OS_CHROMEOS)
 #include "apps/app_window_contents.h"
-#include "apps/shell_window_registry.h"
+#include "apps/app_window_registry.h"
 #include "apps/ui/native_app_window.h"
 #include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_shell_delegate.h"
 #include "chrome/browser/chromeos/login/fake_user_manager.h"
 #include "chrome/browser/ui/apps/chrome_shell_window_delegate.h"
 #include "chrome/browser/ui/ash/launcher/browser_status_monitor.h"
 #include "chrome/browser/ui/ash/launcher/shell_window_launcher_controller.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
 #include "chrome/common/chrome_constants.h"
@@ skipping 616 matching lines @@
   window->SetType(ui::wm::WINDOW_TYPE_NORMAL);
   window->Init(aura::WINDOW_LAYER_TEXTURED);
   window->Show();
 
   scoped_ptr<TestBrowserWindowAura> browser_window(
       new TestBrowserWindowAura(window));
   browser_window->CreateBrowser(params);
   return browser_window.Pass();
 }
 
-// A views delegate which allows creating shell windows.
+// A views delegate which allows creating app windows.
 class TestViewsDelegateForAppTest : public views::TestViewsDelegate {
  public:
   TestViewsDelegateForAppTest() {}
   virtual ~TestViewsDelegateForAppTest() {}
 
   // views::TestViewsDelegate overrides.
   virtual void OnBeforeWidgetInit(
       views::Widget::InitParams* params,
       views::internal::NativeWidgetDelegate* delegate) OVERRIDE {
     if (!params->parent && !params->context) {
@@ skipping 77 matching lines @@
   scoped_ptr<aura::Window> native_window_;
 
   DISALLOW_COPY_AND_ASSIGN(V1App);
 };
 
 // A V2 application which gets created with an |extension| and for a |profile|.
 // Upon destruction it will properly close the application.
 class V2App {
  public:
   V2App(Profile* profile, const extensions::Extension* extension) {
-    window_ = new apps::ShellWindow(profile,
-                                    new ChromeShellWindowDelegate(),
-                                    extension);
-    apps::ShellWindow::CreateParams params = apps::ShellWindow::CreateParams();
-    window_->Init(GURL(std::string()),
-                  new apps::AppWindowContents(window_),
-                  params);
+    window_ = new apps::AppWindow(
+        profile, new ChromeShellWindowDelegate(), extension);
+    apps::AppWindow::CreateParams params = apps::AppWindow::CreateParams();
+    window_->Init(
+        GURL(std::string()), new apps::AppWindowContentsImpl(window_), params);
   }
 
   virtual ~V2App() {
     WebContentsDestroyedWatcher destroyed_watcher(window_->web_contents());
     window_->GetBaseWindow()->Close();
     destroyed_watcher.Wait();
   }
 
  private:
-  // The shell window which represents the application. Note that the window
+  // The app window which represents the application. Note that the window
   // deletes itself asynchronously after window_->GetBaseWindow()->Close() gets
   // called.
-  apps::ShellWindow* window_;
+  apps::AppWindow* window_;
 
   DISALLOW_COPY_AND_ASSIGN(V2App);
 };
 
 // The testing framework to test multi profile scenarios.
 class MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest
     : public ChromeLauncherControllerTest {
  protected:
   MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest() {
   }
@@ skipping 1974 matching lines @@
 
   EXPECT_EQ(1, app_icon_loader->fetch_count());
   ASSERT_EQ(initial_size + 1, model_->items().size());
   EXPECT_TRUE(launcher_controller_->IsAppPinned("1"));
   EXPECT_FALSE(launcher_controller_->IsAppPinned("0"));
   EXPECT_EQ(ash::TYPE_APP_SHORTCUT, model_->items()[app_index].type);
 
   launcher_controller_->UnpinAppWithID("1");
   ASSERT_EQ(initial_size, model_->items().size());
 }