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

Unified Diff: ash/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/shell/shell_delegate_impl.cc ('k') | ash/system/user/tray_user.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell_delegate.h
diff --git a/ash/shell_delegate.h b/ash/shell_delegate.h
index 978b21a65eac84f2d3b9016c8962b1f260abfd88..84134ca74f52c36320af08e60412a054bddcd67e 100644
--- a/ash/shell_delegate.h
+++ b/ash/shell_delegate.h
@@ -9,7 +9,6 @@
#include <string>
#include "ash/ash_export.h"
-#include "ash/shell.h"
#include "base/callback.h"
#include "base/strings/string16.h"
@@ -20,10 +19,6 @@ class AppListPresenter;
class AppListViewDelegate;
}
-namespace aura {
-class Window;
-}
-
namespace gfx {
class Image;
}
@@ -44,6 +39,7 @@ namespace ash {
class AccessibilityDelegate;
class ContainerDelegate;
+class GPUSupport;
class MediaDelegate;
class NewWindowDelegate;
class PointerWatcherDelegate;
@@ -54,6 +50,7 @@ class SystemTrayDelegate;
class UserWallpaperDelegate;
struct ShelfItem;
class WmShelf;
+class WmWindow;
class ASH_EXPORT VirtualKeyboardStateObserver {
public:
@@ -87,7 +84,7 @@ class ASH_EXPORT ShellDelegate {
// Returns true if |window| can be shown for the delegate's concept of current
// user.
- virtual bool CanShowWindowForUser(aura::Window* window) const = 0;
+ virtual bool CanShowWindowForUser(WmWindow* window) const = 0;
// Returns true if the first window shown on first run should be
// unconditionally maximized, overriding the heuristic that normally chooses
« no previous file with comments | « ash/shell/shell_delegate_impl.cc ('k') | ash/system/user/tray_user.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698