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

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

Issue 2908643003: [mus+ash] Removes WmWindow from ash/wm/focus_rules (Closed)
Patch Set: [mus+ash] Removes WmWindow from ash/wm/focus_rules (rebased) Created 3 years, 7 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 b418cee58c9d97a0831a545b8c8710a53ae39c44..dd8d124015bb989b6317afe074bcb0f80e60ee04 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.cc
@@ -432,9 +432,8 @@ bool ChromeShellDelegate::IsRunningInForcedAppMode() const {
return chrome::IsRunningInForcedAppMode();
}
-bool ChromeShellDelegate::CanShowWindowForUser(ash::WmWindow* window) const {
- return ::CanShowWindowForUser(ash::WmWindow::GetAuraWindow(window),
- base::Bind(&GetActiveBrowserContext));
+bool ChromeShellDelegate::CanShowWindowForUser(aura::Window* window) const {
+ return ::CanShowWindowForUser(window, base::Bind(&GetActiveBrowserContext));
}
bool ChromeShellDelegate::IsForceMaximizeOnFirstRun() const {

Powered by Google App Engine
This is Rietveld 408576698