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

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

Issue 2055053002: mash: Convert ash::ShellDelegate from aura::Window to WmWindow (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@movetrayupdate
Patch Set: rebase Created 4 years, 6 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
« no previous file with comments | « ash/test/test_shell_delegate.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/chrome_shell_delegate.h
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate.h b/chrome/browser/ui/ash/chrome_shell_delegate.h
index fa4fe70014ce2a29cd90a9f3a9c0a483a3ace598..8a7505a2d351dd50f69e274ae4f3ea0c8bcbb8fc 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate.h
+++ b/chrome/browser/ui/ash/chrome_shell_delegate.h
@@ -37,7 +37,7 @@ class ChromeShellDelegate : public ash::ShellDelegate,
bool IsMultiProfilesEnabled() const override;
bool IsIncognitoAllowed() const override;
bool IsRunningInForcedAppMode() const override;
- bool CanShowWindowForUser(aura::Window* window) const override;
+ bool CanShowWindowForUser(ash::WmWindow* window) const override;
bool IsForceMaximizeOnFirstRun() const override;
void PreInit() override;
void PreShutdown() override;
« no previous file with comments | « ash/test/test_shell_delegate.cc ('k') | chrome/browser/ui/ash/chrome_shell_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698