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 BLIMP_ENGINE_SESSION_BLIMP_ENGINE_SESSION_H_ | 5 #ifndef BLIMP_ENGINE_SESSION_BLIMP_ENGINE_SESSION_H_ |
6 #define BLIMP_ENGINE_SESSION_BLIMP_ENGINE_SESSION_H_ | 6 #define BLIMP_ENGINE_SESSION_BLIMP_ENGINE_SESSION_H_ |
7 | 7 |
8 #include <stdint.h> | 8 #include <stdint.h> |
9 | 9 |
10 #include <vector> | 10 #include <vector> |
11 | 11 |
12 #include "base/macros.h" | 12 #include "base/macros.h" |
13 #include "base/memory/scoped_ptr.h" | 13 #include "base/memory/scoped_ptr.h" |
14 #include "blimp/common/proto/blimp_message.pb.h" | 14 #include "blimp/common/proto/blimp_message.pb.h" |
15 #include "blimp/engine/feature/engine_render_widget_feature.h" | 15 #include "blimp/engine/feature/engine_render_widget_feature.h" |
| 16 #include "blimp/engine/feature/engine_settings_feature.h" |
| 17 #include "blimp/engine/session/settings_manager.h" |
16 #include "blimp/net/blimp_message_processor.h" | 18 #include "blimp/net/blimp_message_processor.h" |
17 #include "blimp/net/connection_error_observer.h" | 19 #include "blimp/net/connection_error_observer.h" |
18 #include "content/public/browser/invalidate_type.h" | 20 #include "content/public/browser/invalidate_type.h" |
19 #include "content/public/browser/web_contents_delegate.h" | 21 #include "content/public/browser/web_contents_delegate.h" |
20 #include "content/public/browser/web_contents_observer.h" | 22 #include "content/public/browser/web_contents_observer.h" |
21 #include "net/base/completion_callback.h" | 23 #include "net/base/completion_callback.h" |
22 #include "ui/gfx/geometry/size.h" | 24 #include "ui/gfx/geometry/size.h" |
23 | 25 |
24 namespace aura { | 26 namespace aura { |
25 class WindowTreeHost; | 27 class WindowTreeHost; |
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
165 // Used to apply standard focus conventions to the windows in the | 167 // Used to apply standard focus conventions to the windows in the |
166 // WindowTreeHost hierarchy. | 168 // WindowTreeHost hierarchy. |
167 scoped_ptr<wm::FocusController> focus_client_; | 169 scoped_ptr<wm::FocusController> focus_client_; |
168 | 170 |
169 // Used to manage input capture. | 171 // Used to manage input capture. |
170 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; | 172 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; |
171 | 173 |
172 // Only one web_contents is supported for blimp 0.5 | 174 // Only one web_contents is supported for blimp 0.5 |
173 scoped_ptr<content::WebContents> web_contents_; | 175 scoped_ptr<content::WebContents> web_contents_; |
174 | 176 |
| 177 // Manages all global settings for the engine session. |
| 178 SettingsManager settings_manager_; |
| 179 |
| 180 // Handles all incoming messages for type SETTINGS. |
| 181 EngineSettingsFeature settings_feature_; |
| 182 |
175 // Handles all incoming and outgoing messages related to RenderWidget, | 183 // Handles all incoming and outgoing messages related to RenderWidget, |
176 // including INPUT, COMPOSITOR and RENDER_WIDGET messages. | 184 // including INPUT, COMPOSITOR and RENDER_WIDGET messages. |
177 EngineRenderWidgetFeature render_widget_feature_; | 185 EngineRenderWidgetFeature render_widget_feature_; |
178 | 186 |
179 // Container for connection manager, authentication handler, and | 187 // Container for connection manager, authentication handler, and |
180 // browser connection handler. The components run on the I/O thread, and | 188 // browser connection handler. The components run on the I/O thread, and |
181 // this object is destroyed there. | 189 // this object is destroyed there. |
182 scoped_ptr<EngineNetworkComponents> net_components_; | 190 scoped_ptr<EngineNetworkComponents> net_components_; |
183 | 191 |
184 scoped_ptr<ThreadPipeManager> thread_pipe_manager_; | 192 scoped_ptr<ThreadPipeManager> thread_pipe_manager_; |
185 | 193 |
186 // Used to send TAB_CONTROL or NAVIGATION messages to client. | 194 // Used to send TAB_CONTROL or NAVIGATION messages to client. |
187 scoped_ptr<BlimpMessageProcessor> tab_control_message_sender_; | 195 scoped_ptr<BlimpMessageProcessor> tab_control_message_sender_; |
188 scoped_ptr<BlimpMessageProcessor> navigation_message_sender_; | 196 scoped_ptr<BlimpMessageProcessor> navigation_message_sender_; |
189 | 197 |
190 DISALLOW_COPY_AND_ASSIGN(BlimpEngineSession); | 198 DISALLOW_COPY_AND_ASSIGN(BlimpEngineSession); |
191 }; | 199 }; |
192 | 200 |
193 } // namespace engine | 201 } // namespace engine |
194 } // namespace blimp | 202 } // namespace blimp |
195 | 203 |
196 #endif // BLIMP_ENGINE_SESSION_BLIMP_ENGINE_SESSION_H_ | 204 #endif // BLIMP_ENGINE_SESSION_BLIMP_ENGINE_SESSION_H_ |
OLD | NEW |