| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_ | 5 #ifndef MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_ |
| 6 #define MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_ | 6 #define MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 | 9 |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 45 public WindowTreeHostMojoDelegate, | 45 public WindowTreeHostMojoDelegate, |
| 46 public aura::client::FocusChangeObserver, | 46 public aura::client::FocusChangeObserver, |
| 47 public aura::client::ActivationChangeObserver { | 47 public aura::client::ActivationChangeObserver { |
| 48 public: | 48 public: |
| 49 explicit WindowManagerApp(ViewManagerDelegate* delegate); | 49 explicit WindowManagerApp(ViewManagerDelegate* delegate); |
| 50 virtual ~WindowManagerApp(); | 50 virtual ~WindowManagerApp(); |
| 51 | 51 |
| 52 void AddConnection(WindowManagerServiceImpl* connection); | 52 void AddConnection(WindowManagerServiceImpl* connection); |
| 53 void RemoveConnection(WindowManagerServiceImpl* connection); | 53 void RemoveConnection(WindowManagerServiceImpl* connection); |
| 54 | 54 |
| 55 Id OpenWindow(); | |
| 56 Id OpenWindowWithURL(const String& url); | |
| 57 void SetCapture(Id view); | 55 void SetCapture(Id view); |
| 58 void FocusWindow(Id view); | 56 void FocusWindow(Id view); |
| 59 void ActivateWindow(Id view); | 57 void ActivateWindow(Id view); |
| 60 | 58 |
| 61 bool IsReady() const; | 59 bool IsReady() const; |
| 62 | 60 |
| 63 // Overridden from ApplicationDelegate: | 61 // Overridden from ApplicationDelegate: |
| 64 virtual void Initialize(ApplicationImpl* impl) MOJO_OVERRIDE; | 62 virtual void Initialize(ApplicationImpl* impl) MOJO_OVERRIDE; |
| 65 virtual bool ConfigureIncomingConnection(ApplicationConnection* connection) | 63 virtual bool ConfigureIncomingConnection(ApplicationConnection* connection) |
| 66 MOJO_OVERRIDE; | 64 MOJO_OVERRIDE; |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 123 | 121 |
| 124 Connections connections_; | 122 Connections connections_; |
| 125 ViewIdToWindowMap view_id_to_window_map_; | 123 ViewIdToWindowMap view_id_to_window_map_; |
| 126 | 124 |
| 127 DISALLOW_COPY_AND_ASSIGN(WindowManagerApp); | 125 DISALLOW_COPY_AND_ASSIGN(WindowManagerApp); |
| 128 }; | 126 }; |
| 129 | 127 |
| 130 } // namespace mojo | 128 } // namespace mojo |
| 131 | 129 |
| 132 #endif // MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_ | 130 #endif // MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_ |
| OLD | NEW |