Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(596)

Unified Diff: chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc

Issue 166573005: Rename apps::ShellWindow to apps::AppWindow (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, nits (rename) Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
diff --git a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
index 179c309e22a01493b6cc02e2421ceeaa50ceef99..9c3c543c1a40a0492dea841fadbeba3dad8537bd 100644
--- a/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
+++ b/chrome/browser/chromeos/extensions/file_manager/private_api_misc.cc
@@ -4,8 +4,8 @@
#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"
@@ -43,17 +43,16 @@ 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> >
@@ -373,15 +372,15 @@ bool FileBrowserPrivateGetProfilesFunction::RunImpl() {
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,
@@ -419,9 +418,9 @@ bool FileBrowserPrivateVisitDesktopFunction::RunImpl() {
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;
}
@@ -432,14 +431,12 @@ bool FileBrowserPrivateVisitDesktopFunction::RunImpl() {
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;
}

Powered by Google App Engine
This is Rietveld 408576698