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

Unified Diff: ash/aura/wm_root_window_controller_aura.h

Issue 2295003002: mash: Remove WmRootWindowControllerObserver. (Closed)
Patch Set: Address comments. Created 4 years, 4 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_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 d93d3a9782fbf83538beb40b39b95917aabc4402..65cfe949c2ab808b39467ee2ae32d3c786a7b5ff 100644
--- a/ash/aura/wm_root_window_controller_aura.h
+++ b/ash/aura/wm_root_window_controller_aura.h
@@ -6,10 +6,8 @@
#define ASH_AURA_WM_ROOT_CONTROLLER_AURA_H_
#include "ash/ash_export.h"
-#include "ash/common/shell_observer.h"
#include "ash/common/wm_root_window_controller.h"
#include "base/macros.h"
-#include "ui/display/display_observer.h"
namespace aura {
class Window;
@@ -19,9 +17,7 @@ namespace ash {
class RootWindowController;
-class ASH_EXPORT WmRootWindowControllerAura : public WmRootWindowController,
- public ShellObserver,
- public display::DisplayObserver {
+class ASH_EXPORT WmRootWindowControllerAura : public WmRootWindowController {
public:
explicit WmRootWindowControllerAura(
RootWindowController* root_window_controller);
@@ -46,15 +42,6 @@ class ASH_EXPORT WmRootWindowControllerAura : public WmRootWindowController,
WmWindow* FindEventTarget(const gfx::Point& location_in_screen) override;
gfx::Point GetLastMouseLocationInRoot() override;
- // ShellObserver:
- void OnShelfAlignmentChanged(WmWindow* root_window) override;
-
- // DisplayObserver:
- void OnDisplayAdded(const display::Display& display) override;
- void OnDisplayRemoved(const display::Display& display) override;
- void OnDisplayMetricsChanged(const display::Display& display,
- uint32_t metrics) override;
-
private:
friend class RootWindowController;
« no previous file with comments | « ash/ash.gyp ('k') | ash/aura/wm_root_window_controller_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698