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

Unified Diff: chrome/browser/ui/ash/launcher/chrome_launcher_controller_win.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/ui/ash/launcher/chrome_launcher_controller_win.cc
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_win.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_win.cc
index 1e2267f64a203a9daeb6c742e4abeea71cd4fad6..3e50a719c344241a746342d883340910755b2829 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_win.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_win.cc
@@ -4,8 +4,8 @@
#include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.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/path_service.h"
#include "base/strings/string16.h"
#include "base/strings/stringprintf.h"
@@ -22,9 +22,9 @@ bool ChromeLauncherController::LaunchedInNativeDesktop(
// launch request through the viewer process to desktop Chrome. This allows
// Ash to relinquish foreground window status and trigger a switch to
// desktop mode.
- apps::ShellWindow* any_existing_window =
- apps::ShellWindowRegistry::Get(profile())->
- GetCurrentShellWindowForApp(app_id);
+ apps::AppWindow* any_existing_window =
+ apps::AppWindowRegistry::Get(profile())
+ ->GetCurrentAppWindowForApp(app_id);
if (!any_existing_window ||
chrome::GetHostDesktopTypeForNativeWindow(
any_existing_window->GetNativeWindow())

Powered by Google App Engine
This is Rietveld 408576698