| 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/net/blimp_message_processor.h" | 16 #include "blimp/net/blimp_message_processor.h" |
| 17 #include "blimp/net/connection_error_observer.h" | 17 #include "blimp/net/connection_error_observer.h" |
| 18 #include "content/public/browser/invalidate_type.h" | 18 #include "content/public/browser/invalidate_type.h" |
| 19 #include "content/public/browser/web_contents_delegate.h" | 19 #include "content/public/browser/web_contents_delegate.h" |
| 20 #include "content/public/browser/web_contents_observer.h" | 20 #include "content/public/browser/web_contents_observer.h" |
| 21 #include "net/base/completion_callback.h" | 21 #include "net/base/completion_callback.h" |
| 22 #include "ui/base/ime/input_method_observer.h" |
| 22 #include "ui/gfx/geometry/size.h" | 23 #include "ui/gfx/geometry/size.h" |
| 23 | 24 |
| 24 namespace aura { | 25 namespace aura { |
| 25 class WindowTreeHost; | 26 class WindowTreeHost; |
| 26 | 27 |
| 27 namespace client { | 28 namespace client { |
| 28 class DefaultCaptureClient; | 29 class DefaultCaptureClient; |
| 29 class WindowTreeClient; | 30 class WindowTreeClient; |
| 30 } // namespace client | 31 } // namespace client |
| 31 } // namespace aura | 32 } // namespace aura |
| (...skipping 29 matching lines...) Expand all Loading... |
| 61 class BlimpEngineConfig; | 62 class BlimpEngineConfig; |
| 62 class BlimpFocusClient; | 63 class BlimpFocusClient; |
| 63 class BlimpScreen; | 64 class BlimpScreen; |
| 64 class BlimpWindowTreeHost; | 65 class BlimpWindowTreeHost; |
| 65 class EngineNetworkComponents; | 66 class EngineNetworkComponents; |
| 66 | 67 |
| 67 class BlimpEngineSession | 68 class BlimpEngineSession |
| 68 : public BlimpMessageProcessor, | 69 : public BlimpMessageProcessor, |
| 69 public content::WebContentsDelegate, | 70 public content::WebContentsDelegate, |
| 70 public content::WebContentsObserver, | 71 public content::WebContentsObserver, |
| 72 public ui::InputMethodObserver, |
| 71 public EngineRenderWidgetFeature::RenderWidgetMessageDelegate { | 73 public EngineRenderWidgetFeature::RenderWidgetMessageDelegate { |
| 72 public: | 74 public: |
| 73 BlimpEngineSession(scoped_ptr<BlimpBrowserContext> browser_context, | 75 BlimpEngineSession(scoped_ptr<BlimpBrowserContext> browser_context, |
| 74 net::NetLog* net_log, | 76 net::NetLog* net_log, |
| 75 BlimpEngineConfig* config); | 77 BlimpEngineConfig* config); |
| 76 ~BlimpEngineSession() override; | 78 ~BlimpEngineSession() override; |
| 77 | 79 |
| 78 // Starts the network stack on the IO thread, and sets default placeholder | 80 // Starts the network stack on the IO thread, and sets default placeholder |
| 79 // values for e.g. screen size pending real values being supplied by the | 81 // values for e.g. screen size pending real values being supplied by the |
| 80 // client. | 82 // client. |
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 void CloseContents(content::WebContents* source) override; | 133 void CloseContents(content::WebContents* source) override; |
| 132 void ActivateContents(content::WebContents* contents) override; | 134 void ActivateContents(content::WebContents* contents) override; |
| 133 void ForwardCompositorProto( | 135 void ForwardCompositorProto( |
| 134 content::RenderWidgetHost* render_widget_host, | 136 content::RenderWidgetHost* render_widget_host, |
| 135 const std::vector<uint8_t>& proto) override; | 137 const std::vector<uint8_t>& proto) override; |
| 136 void NavigationStateChanged(content::WebContents* source, | 138 void NavigationStateChanged(content::WebContents* source, |
| 137 content::InvalidateTypes changed_flags) override; | 139 content::InvalidateTypes changed_flags) override; |
| 138 void LoadProgressChanged(content::WebContents* source, | 140 void LoadProgressChanged(content::WebContents* source, |
| 139 double progress) override; | 141 double progress) override; |
| 140 | 142 |
| 143 // ui::InputMethodObserver overrides. |
| 144 void OnTextInputTypeChanged(const ui::TextInputClient* client) override; |
| 145 void OnFocus() override; |
| 146 void OnBlur() override; |
| 147 void OnCaretBoundsChanged(const ui::TextInputClient* client) override; |
| 148 void OnTextInputStateChanged(const ui::TextInputClient* client) override; |
| 149 void OnInputMethodDestroyed(const ui::InputMethod* input_method) override; |
| 150 void OnShowImeIfNeeded() override; |
| 151 |
| 141 // content::WebContentsObserver implementation. | 152 // content::WebContentsObserver implementation. |
| 142 void RenderViewCreated(content::RenderViewHost* render_view_host) override; | 153 void RenderViewCreated(content::RenderViewHost* render_view_host) override; |
| 143 void RenderViewHostChanged(content::RenderViewHost* old_host, | 154 void RenderViewHostChanged(content::RenderViewHost* old_host, |
| 144 content::RenderViewHost* new_host) override; | 155 content::RenderViewHost* new_host) override; |
| 145 void RenderViewDeleted(content::RenderViewHost* render_view_host) override; | 156 void RenderViewDeleted(content::RenderViewHost* render_view_host) override; |
| 146 | 157 |
| 147 // Sets up and owns |new_contents|. | 158 // Sets up and owns |new_contents|. |
| 148 void PlatformSetContents(scoped_ptr<content::WebContents> new_contents); | 159 void PlatformSetContents(scoped_ptr<content::WebContents> new_contents); |
| 149 | 160 |
| 150 // Stores the value of the last page load completed update sent to the client. | 161 // Stores the value of the last page load completed update sent to the client. |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 scoped_ptr<BlimpMessageProcessor> tab_control_message_sender_; | 200 scoped_ptr<BlimpMessageProcessor> tab_control_message_sender_; |
| 190 scoped_ptr<BlimpMessageProcessor> navigation_message_sender_; | 201 scoped_ptr<BlimpMessageProcessor> navigation_message_sender_; |
| 191 | 202 |
| 192 DISALLOW_COPY_AND_ASSIGN(BlimpEngineSession); | 203 DISALLOW_COPY_AND_ASSIGN(BlimpEngineSession); |
| 193 }; | 204 }; |
| 194 | 205 |
| 195 } // namespace engine | 206 } // namespace engine |
| 196 } // namespace blimp | 207 } // namespace blimp |
| 197 | 208 |
| 198 #endif // BLIMP_ENGINE_SESSION_BLIMP_ENGINE_SESSION_H_ | 209 #endif // BLIMP_ENGINE_SESSION_BLIMP_ENGINE_SESSION_H_ |
| OLD | NEW |