| OLD | NEW | 
|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #ifndef ASH_MUS_WINDOW_MANAGER_H_ | 5 #ifndef ASH_MUS_WINDOW_MANAGER_H_ | 
| 6 #define ASH_MUS_WINDOW_MANAGER_H_ | 6 #define ASH_MUS_WINDOW_MANAGER_H_ | 
| 7 | 7 | 
| 8 #include <stdint.h> | 8 #include <stdint.h> | 
| 9 | 9 | 
| 10 #include <memory> | 10 #include <memory> | 
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 133   RootWindowController* GetPrimaryRootWindowController(); | 133   RootWindowController* GetPrimaryRootWindowController(); | 
| 134 | 134 | 
| 135   // Returns the RootWindowController where new top levels are created. | 135   // Returns the RootWindowController where new top levels are created. | 
| 136   // |properties| is the properties supplied during window creation. | 136   // |properties| is the properties supplied during window creation. | 
| 137   RootWindowController* GetRootWindowControllerForNewTopLevelWindow( | 137   RootWindowController* GetRootWindowControllerForNewTopLevelWindow( | 
| 138       std::map<std::string, std::vector<uint8_t>>* properties); | 138       std::map<std::string, std::vector<uint8_t>>* properties); | 
| 139 | 139 | 
| 140   // WindowTreeClientDelegate: | 140   // WindowTreeClientDelegate: | 
| 141   void OnEmbed( | 141   void OnEmbed( | 
| 142       std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override; | 142       std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override; | 
| 143   void OnEmbedRootDestroyed(aura::Window* root) override; | 143   void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) override; | 
| 144   void OnLostConnection(aura::WindowTreeClient* client) override; | 144   void OnLostConnection(aura::WindowTreeClient* client) override; | 
| 145   void OnPointerEventObserved(const ui::PointerEvent& event, | 145   void OnPointerEventObserved(const ui::PointerEvent& event, | 
| 146                               aura::Window* target) override; | 146                               aura::Window* target) override; | 
| 147   aura::client::CaptureClient* GetCaptureClient() override; | 147   aura::client::CaptureClient* GetCaptureClient() override; | 
| 148   aura::PropertyConverter* GetPropertyConverter() override; | 148   aura::PropertyConverter* GetPropertyConverter() override; | 
| 149 | 149 | 
| 150   // WindowManagerDelegate: | 150   // WindowManagerDelegate: | 
| 151   void SetWindowManagerClient(aura::WindowManagerClient* client) override; | 151   void SetWindowManagerClient(aura::WindowManagerClient* client) override; | 
| 152   bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override; | 152   bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override; | 
| 153   bool OnWmSetProperty( | 153   bool OnWmSetProperty( | 
| (...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 212 | 212 | 
| 213   std::unique_ptr<ScreenPositionController> screen_position_controller_; | 213   std::unique_ptr<ScreenPositionController> screen_position_controller_; | 
| 214 | 214 | 
| 215   DISALLOW_COPY_AND_ASSIGN(WindowManager); | 215   DISALLOW_COPY_AND_ASSIGN(WindowManager); | 
| 216 }; | 216 }; | 
| 217 | 217 | 
| 218 }  // namespace mus | 218 }  // namespace mus | 
| 219 }  // namespace ash | 219 }  // namespace ash | 
| 220 | 220 | 
| 221 #endif  // ASH_MUS_WINDOW_MANAGER_H_ | 221 #endif  // ASH_MUS_WINDOW_MANAGER_H_ | 
| OLD | NEW | 
|---|