Rename apps::ShellWindow to apps::AppWindow

chrome/browser/extensions/api/tabs/tabs_api.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 "chrome/browser/extensions/api/tabs/tabs_api.h"
 
 #include <algorithm>
 #include <limits>
 #include <vector>
 
-#include "apps/shell_window.h"
+#include "apps/app_window.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 61 matching lines @@
 #include "skia/ext/platform_canvas.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/models/list_selection_model.h"
 #include "ui/base/ui_base_types.h"
 
 #if defined(OS_WIN)
 #include "win8/util/win8_util.h"
 #endif  // OS_WIN
 
 #if defined(USE_ASH)
-#include "apps/shell_window_registry.h"
+#include "apps/app_window_registry.h"
 #include "ash/ash_switches.h"
 #include "chrome/browser/extensions/api/tabs/ash_panel_contents.h"
 #endif
 
-using apps::ShellWindow;
+using apps::AppWindow;
 using content::BrowserThread;
 using content::NavigationController;
 using content::NavigationEntry;
 using content::OpenURLParams;
 using content::Referrer;
 using content::WebContents;
 
 namespace extensions {
 
 namespace windows = api::windows;
@@ skipping 407 matching lines @@
       saw_focus_key = true;
     }
   }
 
   if (create_panel) {
     if (urls.empty())
       urls.push_back(GURL(chrome::kChromeUINewTabURL));
 
 #if defined(USE_ASH)
     if (chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_ASH) {
-      ShellWindow::CreateParams create_params;
-      create_params.window_type = ShellWindow::WINDOW_TYPE_V1_PANEL;
+      AppWindow::CreateParams create_params;
+      create_params.window_type = AppWindow::WINDOW_TYPE_V1_PANEL;
       create_params.bounds = window_bounds;
       create_params.focused = saw_focus_key && focused;
-      ShellWindow* shell_window = new ShellWindow(
-          window_profile, new ChromeShellWindowDelegate(),
-          GetExtension());
-      AshPanelContents* ash_panel_contents = new AshPanelContents(shell_window);
-      shell_window->Init(urls[0], ash_panel_contents, create_params);
+      AppWindow* app_window = new AppWindow(
+          window_profile, new ChromeShellWindowDelegate(), GetExtension());
+      AshPanelContents* ash_panel_contents = new AshPanelContents(app_window);
+      app_window->Init(urls[0], ash_panel_contents, create_params);
       SetResult(ash_panel_contents->GetExtensionWindowController()->
                 CreateWindowValueWithTabs(GetExtension()));
       return true;
     }
 #endif
     std::string title =
         web_app::GenerateApplicationNameFromExtensionId(extension_id);
     // Note: Panels ignore all but the first url provided.
     Panel* panel = PanelManager::GetInstance()->CreatePanel(
         title, window_profile, urls[0], window_bounds, panel_create_mode);
@@ skipping 1362 matching lines @@
   execute_tab_id_ = tab_id;
   details_ = details.Pass();
   return true;
 }
 
 bool TabsInsertCSSFunction::ShouldInsertCSS() const {
   return true;
 }
 
 }  // namespace extensions