Rename apps::ShellWindow to apps::AppWindow

chrome/browser/extensions/api/developer_private/developer_private_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/developer_private/developer_private_api.h"
 
 #include "apps/app_load_service.h"
 #include "apps/app_restore_service.h"
+#include "apps/app_window.h"
+#include "apps/app_window_registry.h"
 #include "apps/saved_files_service.h"
-#include "apps/shell_window.h"
-#include "apps/shell_window_registry.h"
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ skipping 47 matching lines @@
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/webui/web_ui_util.h"
 #include "webkit/browser/fileapi/external_mount_points.h"
 #include "webkit/browser/fileapi/file_system_context.h"
 #include "webkit/browser/fileapi/file_system_operation.h"
 #include "webkit/browser/fileapi/file_system_operation_runner.h"
 #include "webkit/common/blob/shareable_file_reference.h"
 
-using apps::ShellWindow;
-using apps::ShellWindowRegistry;
+using apps::AppWindow;
+using apps::AppWindowRegistry;
 using content::RenderViewHost;
 
 namespace extensions {
 
 namespace developer_private = api::developer_private;
 
 namespace {
 
 const base::FilePath::CharType kUnpackedAppsFolder[]
     = FILE_PATH_LITERAL("apps_target");
@@ skipping 375 matching lines @@
         (web_contents->GetURL() == BackgroundInfo::GetBackgroundURL(extension));
     result->push_back(constructInspectView(
         web_contents->GetURL(),
         process->GetID(),
         host->GetRoutingID(),
         process->GetBrowserContext()->IsOffTheRecord(),
         is_background_page && has_generated_background_page));
   }
 }
 
-void DeveloperPrivateGetItemsInfoFunction::
-    GetShellWindowPagesForExtensionProfile(
-        const Extension* extension,
-        ItemInspectViewList* result) {
-  ShellWindowRegistry* registry = ShellWindowRegistry::Get(GetProfile());
+void DeveloperPrivateGetItemsInfoFunction::GetAppWindowPagesForExtensionProfile(
+    const Extension* extension,
+    ItemInspectViewList* result) {
+  AppWindowRegistry* registry = AppWindowRegistry::Get(GetProfile());
   if (!registry) return;
 
-  const ShellWindowRegistry::ShellWindowList windows =
-      registry->GetShellWindowsForApp(extension->id());
+  const AppWindowRegistry::AppWindowList windows =
+      registry->GetAppWindowsForApp(extension->id());
 
   bool has_generated_background_page =
       BackgroundInfo::HasGeneratedBackgroundPage(extension);
-  for (ShellWindowRegistry::const_iterator it = windows.begin();
-       it != windows.end(); ++it) {
+  for (AppWindowRegistry::const_iterator it = windows.begin();
+       it != windows.end();
+       ++it) {
     content::WebContents* web_contents = (*it)->web_contents();
     RenderViewHost* host = web_contents->GetRenderViewHost();
     content::RenderProcessHost* process = host->GetProcess();
     bool is_background_page =
         (web_contents->GetURL() == BackgroundInfo::GetBackgroundURL(extension));
     result->push_back(constructInspectView(
         web_contents->GetURL(),
         process->GetID(),
         host->GetRoutingID(),
         process->GetBrowserContext()->IsOffTheRecord(),
@@ skipping 32 matching lines @@
 
   ItemInspectViewList result;
   // Get the extension process's active views.
   extensions::ProcessManager* process_manager =
       ExtensionSystem::Get(GetProfile())->process_manager();
   GetInspectablePagesForExtensionProcess(
       extension,
       process_manager->GetRenderViewHostsForExtension(extension->id()),
       &result);
 
-  // Get shell window views
-  GetShellWindowPagesForExtensionProfile(extension, &result);
+  // Get app window views
+  GetAppWindowPagesForExtensionProfile(extension, &result);
 
   // Include a link to start the lazy background page, if applicable.
   if (BackgroundInfo::HasLazyBackgroundPage(extension) &&
       extension_is_enabled &&
       !process_manager->GetBackgroundHostForExtension(extension->id())) {
     result.push_back(constructInspectView(
         BackgroundInfo::GetBackgroundURL(extension),
         -1,
         -1,
         false,
         BackgroundInfo::HasGeneratedBackgroundPage(extension)));
   }
 
   ExtensionService* service = GetProfile()->GetExtensionService();
   // Repeat for the incognito process, if applicable. Don't try to get
-  // shell windows for incognito process.
+  // app windows for incognito process.
   if (service->profile()->HasOffTheRecordProfile() &&
       IncognitoInfo::IsSplitMode(extension)) {
     process_manager = ExtensionSystem::Get(
         service->profile()->GetOffTheRecordProfile())->process_manager();
     GetInspectablePagesForExtensionProcess(
         extension,
         process_manager->GetRenderViewHostsForExtension(extension->id()),
         &result);
 
     if (BackgroundInfo::HasLazyBackgroundPage(extension) &&
@@ skipping 127 matching lines @@
   ExtensionService* service = GetProfile()->GetExtensionService();
   CHECK(!params->item_id.empty());
   service->ReloadExtension(params->item_id);
   return true;
 }
 
 bool DeveloperPrivateShowPermissionsDialogFunction::RunImpl() {
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &extension_id_));
   ExtensionService* service = GetProfile()->GetExtensionService();
   CHECK(!extension_id_.empty());
-  ShellWindowRegistry* registry = ShellWindowRegistry::Get(GetProfile());
+  AppWindowRegistry* registry = AppWindowRegistry::Get(GetProfile());
   DCHECK(registry);
-  ShellWindow* shell_window = registry->GetShellWindowForRenderViewHost(
-      render_view_host());
-  prompt_.reset(new ExtensionInstallPrompt(shell_window->web_contents()));
+  AppWindow* app_window =
+      registry->GetAppWindowForRenderViewHost(render_view_host());
+  prompt_.reset(new ExtensionInstallPrompt(app_window->web_contents()));
   const Extension* extension = service->GetInstalledExtension(extension_id_);
 
   if (!extension)
     return false;
 
   // Released by InstallUIAbort or InstallUIProceed.
   AddRef();
   std::vector<base::FilePath> retained_file_paths;
   if (extension->HasAPIPermission(extensions::APIPermission::kFileSystem)) {
     std::vector<apps::SavedFileEntry> retained_file_entries =
@@ skipping 55 matching lines @@
       (!enable && policy->MustRemainEnabled(extension, NULL)) ||
       (enable && policy->MustRemainDisabled(extension, NULL, NULL))) {
     LOG(ERROR) << "Attempt to change enable state denied by management policy. "
                << "Extension id: " << extension_id.c_str();
     return false;
   }
 
   if (enable) {
     ExtensionPrefs* prefs = service->extension_prefs();
     if (prefs->DidExtensionEscalatePermissions(extension_id)) {
-      ShellWindowRegistry* registry = ShellWindowRegistry::Get(GetProfile());
+      AppWindowRegistry* registry = AppWindowRegistry::Get(GetProfile());
       CHECK(registry);
-      ShellWindow* shell_window = registry->GetShellWindowForRenderViewHost(
-          render_view_host());
-      if (!shell_window) {
+      AppWindow* app_window =
+          registry->GetAppWindowForRenderViewHost(render_view_host());
+      if (!app_window) {
         return false;
       }
 
       ShowExtensionDisabledDialog(
-          service, shell_window->web_contents(), extension);
+          service, app_window->web_contents(), extension);
     } else if ((prefs->GetDisableReasons(extension_id) &
                   Extension::DISABLE_UNSUPPORTED_REQUIREMENT) &&
                !requirements_checker_.get()) {
       // Recheck the requirements.
       scoped_refptr<const Extension> extension =
           service->GetExtensionById(extension_id,
                                      true );// include_disabled
       requirements_checker_.reset(new RequirementsChecker);
       // Released by OnRequirementsChecked.
       AddRef();
@@ skipping 98 matching lines @@
   SendResponse(false);
   Release();
 }
 
 bool DeveloperPrivateChooseEntryFunction::ShowPicker(
     ui::SelectFileDialog::Type picker_type,
     const base::FilePath& last_directory,
     const base::string16& select_title,
     const ui::SelectFileDialog::FileTypeInfo& info,
     int file_type_index) {
-  ShellWindowRegistry* registry = ShellWindowRegistry::Get(GetProfile());
+  AppWindowRegistry* registry = AppWindowRegistry::Get(GetProfile());
   DCHECK(registry);
-  ShellWindow* shell_window = registry->GetShellWindowForRenderViewHost(
-      render_view_host());
-  if (!shell_window) {
+  AppWindow* app_window =
+      registry->GetAppWindowForRenderViewHost(render_view_host());
+  if (!app_window) {
     return false;
   }
 
   // The entry picker will hold a reference to this function instance,
   // and subsequent sending of the function response) until the user has
   // selected a file or cancelled the picker. At that point, the picker will
   // delete itself.
-  new EntryPicker(this, shell_window->web_contents(), picker_type,
-  last_directory, select_title, info, file_type_index);
+  new EntryPicker(this,
+                  app_window->web_contents(),
+                  picker_type,
+                  last_directory,
+                  select_title,
+                  info,
+                  file_type_index);
   return true;
 }
 
 bool DeveloperPrivateChooseEntryFunction::RunImpl() { return false; }
 
 DeveloperPrivateChooseEntryFunction::~DeveloperPrivateChooseEntryFunction() {}
 
 void DeveloperPrivatePackDirectoryFunction::OnPackSuccess(
     const base::FilePath& crx_file,
     const base::FilePath& pem_file) {
@@ skipping 398 matching lines @@
   }
 
   error_ui_util::HandleOpenDevTools(dict);
 
   return true;
 }
 
 } // namespace api
 
 } // namespace extensions