Rename apps::ShellWindow to apps::AppWindow

chrome/browser/chromeos/extensions/file_manager/private_api_misc.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/chromeos/extensions/file_manager/private_api_misc.h"
 
-#include "apps/shell_window.h"
-#include "apps/shell_window_registry.h"
+#include "apps/app_window.h"
+#include "apps/app_window_registry.h"
 #include "base/files/file_path.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/extensions/file_manager/event_router.h"
 #include "chrome/browser/chromeos/extensions/file_manager/file_browser_private_api.h"
 #include "chrome/browser/chromeos/extensions/file_manager/private_api_util.h"
 #include "chrome/browser/chromeos/file_manager/app_installer.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
@@ skipping 17 matching lines @@
 #include "content/public/common/page_zoom.h"
 #include "google_apis/drive/auth_service.h"
 #include "ui/base/webui/web_ui_util.h"
 #include "url/gurl.h"
 
 namespace extensions {
 
 namespace {
 const char kCWSScope[] = "https://www.googleapis.com/auth/chromewebstore";
 
-// Obtains the current shell window.
-apps::ShellWindow*
-GetCurrentShellWindow(ChromeSyncExtensionFunction* function) {
-  apps::ShellWindowRegistry* const shell_window_registry =
-      apps::ShellWindowRegistry::Get(function->GetProfile());
+// Obtains the current app window.
+apps::AppWindow* GetCurrentAppWindow(ChromeSyncExtensionFunction* function) {
+  apps::AppWindowRegistry* const app_window_registry =
+      apps::AppWindowRegistry::Get(function->GetProfile());
   content::WebContents* const contents = function->GetAssociatedWebContents();
   content::RenderViewHost* const render_view_host =
       contents ? contents->GetRenderViewHost() : NULL;
-  return render_view_host ?
-      shell_window_registry->GetShellWindowForRenderViewHost(render_view_host) :
-      NULL;
+  return render_view_host ? app_window_registry->GetAppWindowForRenderViewHost(
+                                render_view_host)
+                          : NULL;
 }
 
 std::vector<linked_ptr<api::file_browser_private::ProfileInfo> >
 GetLoggedInProfileInfoList() {
   DCHECK(chromeos::UserManager::IsInitialized());
   const std::vector<Profile*>& profiles =
       g_browser_process->profile_manager()->GetLoadedProfiles();
   std::set<Profile*> original_profiles;
   std::vector<linked_ptr<api::file_browser_private::ProfileInfo> >
       result_profiles;
@@ skipping 299 matching lines @@
     SetResult(base::Value::CreateNullValue());
     SendResponse(false);
   }
 }
 
 bool FileBrowserPrivateGetProfilesFunction::RunImpl() {
   const std::vector<linked_ptr<api::file_browser_private::ProfileInfo> >&
       profiles = GetLoggedInProfileInfoList();
 
   // Obtains the display profile ID.
-  apps::ShellWindow* const shell_window = GetCurrentShellWindow(this);
+  apps::AppWindow* const app_window = GetCurrentAppWindow(this);
   chrome::MultiUserWindowManager* const window_manager =
       chrome::MultiUserWindowManager::GetInstance();
   const std::string current_profile_id =
       multi_user_util::GetUserIDFromProfile(GetProfile());
   const std::string display_profile_id =
-      window_manager && shell_window ?
-      window_manager->GetUserPresentingWindow(shell_window->GetNativeWindow()) :
-      "";
+      window_manager && app_window ? window_manager->GetUserPresentingWindow(
+                                         app_window->GetNativeWindow())
+                                   : "";
 
   results_ = api::file_browser_private::GetProfiles::Results::Create(
       profiles,
       current_profile_id,
       display_profile_id.empty() ? current_profile_id : display_profile_id);
   return true;
 }
 
 bool FileBrowserPrivateVisitDesktopFunction::RunImpl() {
   using api::file_browser_private::VisitDesktop::Params;
@@ skipping 17 matching lines @@
     if (profiles[i]->profile_id == params->profile_id) {
       logged_in = true;
       break;
     }
   }
   if (!logged_in) {
     SetError("The user is not logged-in now.");
     return false;
   }
 
-  // Look for the current shell window.
-  apps::ShellWindow* const shell_window = GetCurrentShellWindow(this);
-  if (!shell_window) {
+  // Look for the current app window.
+  apps::AppWindow* const app_window = GetCurrentAppWindow(this);
+  if (!app_window) {
     SetError("Target window is not found.");
     return false;
   }
 
   // Observe owner changes of windows.
   file_manager::EventRouter* const event_router =
       file_manager::FileBrowserPrivateAPI::Get(GetProfile())->event_router();
   event_router->RegisterMultiUserWindowManagerObserver();
 
   // Move the window to the user's desktop.
-  window_manager->ShowWindowForUser(
-      shell_window->GetNativeWindow(),
-      params->profile_id);
+  window_manager->ShowWindowForUser(app_window->GetNativeWindow(),
+                                    params->profile_id);
 
   // Check the result.
-  if (!window_manager->IsWindowOnDesktopOfUser(
-          shell_window->GetNativeWindow(),
-          params->profile_id)) {
+  if (!window_manager->IsWindowOnDesktopOfUser(app_window->GetNativeWindow(),
+                                               params->profile_id)) {
     SetError("The window cannot visit the desktop.");
     return false;
   }
 
   return true;
 }
 
 }  // namespace extensions