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

Unified Diff: ash/mus/bridge/wm_shell_mus.h

Issue 2115663002: Folds methods in WmShellCommon to WmShell (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge 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/common/wm_shell_common.cc ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/bridge/wm_shell_mus.h
diff --git a/ash/mus/bridge/wm_shell_mus.h b/ash/mus/bridge/wm_shell_mus.h
index 2be9461237affea0bbb24e6cc1a9c1b26d81bbd8..9bae6bc7b324063307e88d021a995b82b4afa174 100644
--- a/ash/mus/bridge/wm_shell_mus.h
+++ b/ash/mus/bridge/wm_shell_mus.h
@@ -19,9 +19,6 @@ class WindowTreeClient;
}
namespace ash {
-
-class WmShellCommon;
-
namespace mus {
class WmRootWindowControllerMus;
@@ -45,7 +42,6 @@ class WmShellMus : public WmShell, public ::mus::WindowTreeClientObserver {
WmRootWindowControllerMus* GetRootWindowControllerWithDisplayId(int64_t id);
// WmShell:
- MruWindowTracker* GetMruWindowTracker() override;
WmWindow* NewContainerWindow() override;
WmWindow* GetFocusedWindow() override;
WmWindow* GetActiveWindow() override;
@@ -74,8 +70,6 @@ class WmShellMus : public WmShell, public ::mus::WindowTreeClientObserver {
void RemoveActivationObserver(WmActivationObserver* observer) override;
void AddDisplayObserver(WmDisplayObserver* observer) override;
void RemoveDisplayObserver(WmDisplayObserver* observer) override;
- void AddShellObserver(ShellObserver* observer) override;
- void RemoveShellObserver(ShellObserver* observer) override;
void AddPointerWatcher(views::PointerWatcher* watcher) override;
void RemovePointerWatcher(views::PointerWatcher* watcher) override;
#if defined(OS_CHROMEOS)
@@ -95,8 +89,6 @@ class WmShellMus : public WmShell, public ::mus::WindowTreeClientObserver {
::mus::WindowTreeClient* client_;
- std::unique_ptr<WmShellCommon> wm_shell_common_;
-
std::vector<WmRootWindowControllerMus*> root_window_controllers_;
std::unique_ptr<SessionStateDelegate> session_state_delegate_;
« no previous file with comments | « ash/common/wm_shell_common.cc ('k') | ash/mus/bridge/wm_shell_mus.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698