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

Unified Diff: ash/aura/wm_shell_aura.h

Issue 2041423002: Moves MruWindowTracker to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_mru_window_tracker
Patch Set: wm 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/ash.gyp ('k') | ash/aura/wm_shell_aura.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/aura/wm_shell_aura.h
diff --git a/ash/aura/wm_shell_aura.h b/ash/aura/wm_shell_aura.h
index 34a15a1d928e8cc73c469a257ae68b54c5186770..cfb45c6bab7e86dc402c52692dbef996012ea452 100644
--- a/ash/aura/wm_shell_aura.h
+++ b/ash/aura/wm_shell_aura.h
@@ -5,8 +5,6 @@
#ifndef ASH_AURA_WM_SHELL_AURA_H_
#define ASH_AURA_WM_SHELL_AURA_H_
-#include <set>
-
#include "ash/ash_export.h"
#include "ash/aura/wm_lookup_aura.h"
#include "ash/common/wm_shell.h"
@@ -18,25 +16,27 @@
namespace ash {
+class WmShellCommon;
+
class ASH_EXPORT WmShellAura : public WmShell,
public aura::client::ActivationChangeObserver,
public WindowTreeHostManager::Observer,
public ShellObserver {
public:
- WmShellAura();
+ // |shell_common| is not owned by this class and must outlive this class.
+ explicit WmShellAura(WmShellCommon* wm_shell_common);
~WmShellAura() override;
static WmShellAura* Get();
// WmShell:
+ MruWindowTracker* GetMruWindowTracker() override;
WmWindow* NewContainerWindow() override;
WmWindow* GetFocusedWindow() override;
WmWindow* GetActiveWindow() override;
WmWindow* GetPrimaryRootWindow() override;
WmWindow* GetRootWindowForDisplayId(int64_t display_id) override;
WmWindow* GetRootWindowForNewWindows() override;
- std::vector<WmWindow*> GetMruWindowList() override;
- std::vector<WmWindow*> GetMruWindowListIgnoreModals() override;
bool IsForceMaximizeOnFirstRun() override;
bool CanShowWindowForUser(WmWindow* window) override;
void LockCursor() override;
@@ -71,6 +71,9 @@ class ASH_EXPORT WmShellAura : public WmShell,
// ShellObserver:
void OnOverviewModeEnded() override;
+ // Owned by Shell.
+ WmShellCommon* wm_shell_common_;
+
WmLookupAura wm_lookup_;
bool added_activation_observer_ = false;
base::ObserverList<WmActivationObserver> activation_observers_;
« no previous file with comments | « ash/ash.gyp ('k') | ash/aura/wm_shell_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698