| 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_BROWSER_BLIMP_ENGINE_SESSION_H_ | 5 #ifndef BLIMP_ENGINE_BROWSER_BLIMP_ENGINE_SESSION_H_ |
| 6 #define BLIMP_ENGINE_BROWSER_BLIMP_ENGINE_SESSION_H_ | 6 #define BLIMP_ENGINE_BROWSER_BLIMP_ENGINE_SESSION_H_ |
| 7 | 7 |
| 8 #include "base/macros.h" | 8 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "blimp/net/blimp_message_receiver.h" | 10 #include "blimp/net/blimp_message_receiver.h" |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 content::WebContents* new_contents, | 77 content::WebContents* new_contents, |
| 78 WindowOpenDisposition disposition, | 78 WindowOpenDisposition disposition, |
| 79 const gfx::Rect& initial_rect, | 79 const gfx::Rect& initial_rect, |
| 80 bool user_gesture, | 80 bool user_gesture, |
| 81 bool* was_blocked) override; | 81 bool* was_blocked) override; |
| 82 void RequestToLockMouse(content::WebContents* web_contents, | 82 void RequestToLockMouse(content::WebContents* web_contents, |
| 83 bool user_gesture, | 83 bool user_gesture, |
| 84 bool last_unlocked_by_target) override; | 84 bool last_unlocked_by_target) override; |
| 85 void CloseContents(content::WebContents* source) override; | 85 void CloseContents(content::WebContents* source) override; |
| 86 void ActivateContents(content::WebContents* contents) override; | 86 void ActivateContents(content::WebContents* contents) override; |
| 87 void HandleCompositorProto(const std::vector<char>& proto) override; |
| 87 | 88 |
| 88 // Sets up and owns |new_contents|. | 89 // Sets up and owns |new_contents|. |
| 89 void PlatformSetContents(scoped_ptr<content::WebContents> new_contents); | 90 void PlatformSetContents(scoped_ptr<content::WebContents> new_contents); |
| 90 | 91 |
| 91 scoped_ptr<BlimpBrowserContext> browser_context_; | 92 scoped_ptr<BlimpBrowserContext> browser_context_; |
| 92 scoped_ptr<BlimpScreen> screen_; | 93 scoped_ptr<BlimpScreen> screen_; |
| 93 | 94 |
| 94 // Context factory for compositor. | 95 // Context factory for compositor. |
| 95 scoped_ptr<BlimpUiContextFactory> context_factory_; | 96 scoped_ptr<BlimpUiContextFactory> context_factory_; |
| 96 | 97 |
| (...skipping 14 matching lines...) Expand all Loading... |
| 111 // Currently attached client connection. | 112 // Currently attached client connection. |
| 112 scoped_ptr<BlimpConnection> client_connection_; | 113 scoped_ptr<BlimpConnection> client_connection_; |
| 113 | 114 |
| 114 DISALLOW_COPY_AND_ASSIGN(BlimpEngineSession); | 115 DISALLOW_COPY_AND_ASSIGN(BlimpEngineSession); |
| 115 }; | 116 }; |
| 116 | 117 |
| 117 } // namespace engine | 118 } // namespace engine |
| 118 } // namespace blimp | 119 } // namespace blimp |
| 119 | 120 |
| 120 #endif // BLIMP_ENGINE_BROWSER_BLIMP_ENGINE_SESSION_H_ | 121 #endif // BLIMP_ENGINE_BROWSER_BLIMP_ENGINE_SESSION_H_ |
| OLD | NEW |