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

Unified Diff: chrome/browser/ui/ash/chrome_shell_delegate.cc

Issue 2629643002: chromeos: Renames WmWindowAura to WmWindow (Closed)
Patch Set: feedback Created 3 years, 11 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/chrome_shell_delegate.cc
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.cc b/chrome/browser/ui/ash/chrome_shell_delegate.cc
index 383874b256d01a47ac2806f99fd4340536a9e620..8eb1cba9e40d325810a6b7e0d54c1c394832878a 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -10,7 +10,6 @@
#include "ash/accelerators/magnifier_key_scroller.h"
#include "ash/accelerators/spoken_feedback_toggler.h"
-#include "ash/aura/wm_window_aura.h"
#include "ash/common/accessibility_delegate.h"
#include "ash/common/accessibility_types.h"
#include "ash/common/session/session_state_delegate.h"
@@ -18,6 +17,7 @@
#include "ash/common/wm/mru_window_tracker.h"
#include "ash/common/wm/window_state.h"
#include "ash/common/wm_shell.h"
+#include "ash/common/wm_window.h"
#include "ash/content/gpu_support_impl.h"
#include "ash/shell.h"
#include "ash/wm/window_util.h"
@@ -88,7 +88,7 @@ void InitAfterFirstSessionStart() {
// Restore focus after the user session is started. It's needed because some
// windows can be opened in background while login UI is still active because
// we currently restore browser windows before login UI is deleted.
- aura::Window::Windows mru_list = ash::WmWindowAura::ToAuraWindows(
+ aura::Window::Windows mru_list = ash::WmWindow::ToAuraWindows(
ash::WmShell::Get()->mru_window_tracker()->BuildMruWindowList());
if (!mru_list.empty())
mru_list.front()->Focus();
@@ -390,7 +390,7 @@ bool ChromeShellDelegate::IsRunningInForcedAppMode() const {
}
bool ChromeShellDelegate::CanShowWindowForUser(ash::WmWindow* window) const {
- return ::CanShowWindowForUser(ash::WmWindowAura::GetAuraWindow(window),
+ return ::CanShowWindowForUser(ash::WmWindow::GetAuraWindow(window),
base::Bind(&GetActiveBrowserContext));
}

Powered by Google App Engine
This is Rietveld 408576698