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

Unified Diff: ash/aura/wm_root_window_controller_aura.h

Issue 2350953009: Centralizes more shared code between ash and mash (Closed)
Patch Set: feedback Created 4 years, 3 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 | « no previous file | ash/aura/wm_root_window_controller_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/wm_root_window_controller_aura.h
diff --git a/ash/aura/wm_root_window_controller_aura.h b/ash/aura/wm_root_window_controller_aura.h
index 17c8b0756e64833ecfe79dc45cc2f7510c01650e..0b8883973db106091f94ebe4bda4407d7927b03d 100644
--- a/ash/aura/wm_root_window_controller_aura.h
+++ b/ash/aura/wm_root_window_controller_aura.h
@@ -32,7 +32,6 @@ class ASH_EXPORT WmRootWindowControllerAura : public WmRootWindowController {
// WmRootWindowController:
bool HasShelf() override;
WmShell* GetShell() override;
- AlwaysOnTopController* GetAlwaysOnTopController() override;
WmShelf* GetShelf() override;
WmWindow* GetWindow() override;
void ConfigureWidgetInitParamsForContainer(
@@ -44,6 +43,10 @@ class ASH_EXPORT WmRootWindowControllerAura : public WmRootWindowController {
void OnInitialWallpaperAnimationStarted() override;
void OnWallpaperAnimationFinished(views::Widget* widget) override;
+ protected:
+ // WmRootWindowController:
+ bool ShouldDestroyWindowInCloseChildWindows(WmWindow* window) override;
+
private:
friend class RootWindowController;
« no previous file with comments | « no previous file | ash/aura/wm_root_window_controller_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698