| 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" |
| 16 #include "blimp/net/blimp_message_processor.h" | 17 #include "blimp/net/blimp_message_processor.h" |
| 17 #include "blimp/net/connection_error_observer.h" | 18 #include "blimp/net/connection_error_observer.h" |
| 18 #include "content/public/browser/invalidate_type.h" | 19 #include "content/public/browser/invalidate_type.h" |
| 19 #include "content/public/browser/web_contents_delegate.h" | 20 #include "content/public/browser/web_contents_delegate.h" |
| 20 #include "content/public/browser/web_contents_observer.h" | 21 #include "content/public/browser/web_contents_observer.h" |
| 21 #include "net/base/completion_callback.h" | 22 #include "net/base/completion_callback.h" |
| 22 #include "ui/base/ime/input_method_observer.h" | 23 #include "ui/base/ime/input_method_observer.h" |
| 23 #include "ui/gfx/geometry/size.h" | 24 #include "ui/gfx/geometry/size.h" |
| 24 | 25 |
| 25 namespace aura { | 26 namespace aura { |
| (...skipping 22 matching lines...) Expand all Loading... |
| 48 namespace wm { | 49 namespace wm { |
| 49 class FocusController; | 50 class FocusController; |
| 50 } | 51 } |
| 51 | 52 |
| 52 namespace blimp { | 53 namespace blimp { |
| 53 | 54 |
| 54 class BlimpConnection; | 55 class BlimpConnection; |
| 55 class BlimpMessage; | 56 class BlimpMessage; |
| 56 class BlimpMessageThreadPipe; | 57 class BlimpMessageThreadPipe; |
| 57 class ThreadPipeManager; | 58 class ThreadPipeManager; |
| 59 class SettingsManager; |
| 58 | 60 |
| 59 namespace engine { | 61 namespace engine { |
| 60 | 62 |
| 61 class BlimpBrowserContext; | 63 class BlimpBrowserContext; |
| 62 class BlimpEngineConfig; | 64 class BlimpEngineConfig; |
| 63 class BlimpFocusClient; | 65 class BlimpFocusClient; |
| 64 class BlimpScreen; | 66 class BlimpScreen; |
| 65 class BlimpWindowTreeHost; | 67 class BlimpWindowTreeHost; |
| 66 class EngineNetworkComponents; | 68 class EngineNetworkComponents; |
| 67 | 69 |
| 68 class BlimpEngineSession | 70 class BlimpEngineSession |
| 69 : public BlimpMessageProcessor, | 71 : public BlimpMessageProcessor, |
| 70 public content::WebContentsDelegate, | 72 public content::WebContentsDelegate, |
| 71 public content::WebContentsObserver, | 73 public content::WebContentsObserver, |
| 72 public ui::InputMethodObserver, | 74 public ui::InputMethodObserver, |
| 73 public EngineRenderWidgetFeature::RenderWidgetMessageDelegate { | 75 public EngineRenderWidgetFeature::RenderWidgetMessageDelegate { |
| 74 public: | 76 public: |
| 75 BlimpEngineSession(scoped_ptr<BlimpBrowserContext> browser_context, | 77 BlimpEngineSession(scoped_ptr<BlimpBrowserContext> browser_context, |
| 76 net::NetLog* net_log, | 78 net::NetLog* net_log, |
| 77 BlimpEngineConfig* config); | 79 BlimpEngineConfig* config, |
| 80 SettingsManager* settings_manager); |
| 78 ~BlimpEngineSession() override; | 81 ~BlimpEngineSession() override; |
| 79 | 82 |
| 80 // Starts the network stack on the IO thread, and sets default placeholder | 83 // Starts the network stack on the IO thread, and sets default placeholder |
| 81 // values for e.g. screen size pending real values being supplied by the | 84 // values for e.g. screen size pending real values being supplied by the |
| 82 // client. | 85 // client. |
| 83 void Initialize(); | 86 void Initialize(); |
| 84 | 87 |
| 85 BlimpBrowserContext* browser_context() { return browser_context_.get(); } | 88 BlimpBrowserContext* browser_context() { return browser_context_.get(); } |
| 86 | 89 |
| 87 // BlimpMessageProcessor implementation. | 90 // BlimpMessageProcessor implementation. |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 178 // Used to apply standard focus conventions to the windows in the | 181 // Used to apply standard focus conventions to the windows in the |
| 179 // WindowTreeHost hierarchy. | 182 // WindowTreeHost hierarchy. |
| 180 scoped_ptr<wm::FocusController> focus_client_; | 183 scoped_ptr<wm::FocusController> focus_client_; |
| 181 | 184 |
| 182 // Used to manage input capture. | 185 // Used to manage input capture. |
| 183 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; | 186 scoped_ptr<aura::client::DefaultCaptureClient> capture_client_; |
| 184 | 187 |
| 185 // Only one web_contents is supported for blimp 0.5 | 188 // Only one web_contents is supported for blimp 0.5 |
| 186 scoped_ptr<content::WebContents> web_contents_; | 189 scoped_ptr<content::WebContents> web_contents_; |
| 187 | 190 |
| 191 // Manages all global settings for the engine session. |
| 192 SettingsManager* settings_manager_; |
| 193 |
| 194 // Handles all incoming messages for type SETTINGS. |
| 195 EngineSettingsFeature settings_feature_; |
| 196 |
| 188 // Handles all incoming and outgoing messages related to RenderWidget, | 197 // Handles all incoming and outgoing messages related to RenderWidget, |
| 189 // including INPUT, COMPOSITOR and RENDER_WIDGET messages. | 198 // including INPUT, COMPOSITOR and RENDER_WIDGET messages. |
| 190 EngineRenderWidgetFeature render_widget_feature_; | 199 EngineRenderWidgetFeature render_widget_feature_; |
| 191 | 200 |
| 192 // Container for connection manager, authentication handler, and | 201 // Container for connection manager, authentication handler, and |
| 193 // browser connection handler. The components run on the I/O thread, and | 202 // browser connection handler. The components run on the I/O thread, and |
| 194 // this object is destroyed there. | 203 // this object is destroyed there. |
| 195 scoped_ptr<EngineNetworkComponents> net_components_; | 204 scoped_ptr<EngineNetworkComponents> net_components_; |
| 196 | 205 |
| 197 scoped_ptr<ThreadPipeManager> thread_pipe_manager_; | 206 scoped_ptr<ThreadPipeManager> thread_pipe_manager_; |
| 198 | 207 |
| 199 // Used to send TAB_CONTROL or NAVIGATION messages to client. | 208 // Used to send TAB_CONTROL or NAVIGATION messages to client. |
| 200 scoped_ptr<BlimpMessageProcessor> tab_control_message_sender_; | 209 scoped_ptr<BlimpMessageProcessor> tab_control_message_sender_; |
| 201 scoped_ptr<BlimpMessageProcessor> navigation_message_sender_; | 210 scoped_ptr<BlimpMessageProcessor> navigation_message_sender_; |
| 202 | 211 |
| 203 DISALLOW_COPY_AND_ASSIGN(BlimpEngineSession); | 212 DISALLOW_COPY_AND_ASSIGN(BlimpEngineSession); |
| 204 }; | 213 }; |
| 205 | 214 |
| 206 } // namespace engine | 215 } // namespace engine |
| 207 } // namespace blimp | 216 } // namespace blimp |
| 208 | 217 |
| 209 #endif // BLIMP_ENGINE_SESSION_BLIMP_ENGINE_SESSION_H_ | 218 #endif // BLIMP_ENGINE_SESSION_BLIMP_ENGINE_SESSION_H_ |
| OLD | NEW |