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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
76 FocusController* focus_controller() { return focus_controller_.get(); } | 76 FocusController* focus_controller() { return focus_controller_.get(); } |
77 | 77 |
78 void InitFocus(scoped_ptr<FocusRules> rules); | 78 void InitFocus(scoped_ptr<FocusRules> rules); |
79 | 79 |
80 // WindowManagerImpl::Embed() forwards to this. If connected to ViewManager | 80 // WindowManagerImpl::Embed() forwards to this. If connected to ViewManager |
81 // then forwards to delegate, otherwise waits for connection to establish then | 81 // then forwards to delegate, otherwise waits for connection to establish then |
82 // forwards. | 82 // forwards. |
83 void Embed(const String& url, | 83 void Embed(const String& url, |
84 InterfaceRequest<ServiceProvider> service_provider); | 84 InterfaceRequest<ServiceProvider> service_provider); |
85 | 85 |
86 // Calls through to WindowManagerInternalClient::CloneAndAnimate(); see mojom | |
msw
2014/11/18 23:37:43
nit "to WindowManagerInternalClient; see "
| |
87 // for description. | |
88 void CloneAndAnimate(Id view); | |
msw
2014/11/18 23:37:44
Is this actually called somewhere?
sky
2014/11/19 00:49:40
I was adding it now to cut down on size of future
| |
89 | |
86 // Overridden from ApplicationDelegate: | 90 // Overridden from ApplicationDelegate: |
87 void Initialize(ApplicationImpl* impl) override; | 91 void Initialize(ApplicationImpl* impl) override; |
88 bool ConfigureIncomingConnection(ApplicationConnection* connection) override; | 92 bool ConfigureIncomingConnection(ApplicationConnection* connection) override; |
89 | 93 |
90 private: | 94 private: |
91 // TODO(sky): rename this. Connections is ambiguous. | 95 // TODO(sky): rename this. Connections is ambiguous. |
92 typedef std::set<WindowManagerImpl*> Connections; | 96 typedef std::set<WindowManagerImpl*> Connections; |
93 typedef std::set<Id> RegisteredViewIdSet; | 97 typedef std::set<Id> RegisteredViewIdSet; |
94 | 98 |
95 struct PendingEmbed; | 99 struct PendingEmbed; |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
161 scoped_ptr<ViewManagerClient> view_manager_client_; | 165 scoped_ptr<ViewManagerClient> view_manager_client_; |
162 | 166 |
163 scoped_ptr<ViewEventDispatcher> view_event_dispatcher_; | 167 scoped_ptr<ViewEventDispatcher> view_event_dispatcher_; |
164 | 168 |
165 DISALLOW_COPY_AND_ASSIGN(WindowManagerApp); | 169 DISALLOW_COPY_AND_ASSIGN(WindowManagerApp); |
166 }; | 170 }; |
167 | 171 |
168 } // namespace mojo | 172 } // namespace mojo |
169 | 173 |
170 #endif // MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_ | 174 #endif // MOJO_SERVICES_WINDOW_MANAGER_WINDOW_MANAGER_APP_H_ |
OLD | NEW |