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