| 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 COMPONENTS_WEB_VIEW_FRAME_CONNECTION_H_ | 5 #ifndef COMPONENTS_WEB_VIEW_FRAME_CONNECTION_H_ |
| 6 #define COMPONENTS_WEB_VIEW_FRAME_CONNECTION_H_ | 6 #define COMPONENTS_WEB_VIEW_FRAME_CONNECTION_H_ |
| 7 | 7 |
| 8 #include "base/basictypes.h" | 8 #include "base/basictypes.h" |
| 9 #include "base/callback.h" | 9 #include "base/callback.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| 11 #include "components/mus/public/interfaces/view_tree.mojom.h" | 11 #include "components/mus/public/interfaces/window_tree.mojom.h" |
| 12 #include "components/web_view/frame_tree_delegate.h" | 12 #include "components/web_view/frame_tree_delegate.h" |
| 13 #include "components/web_view/frame_user_data.h" | 13 #include "components/web_view/frame_user_data.h" |
| 14 #include "components/web_view/public/interfaces/frame.mojom.h" | 14 #include "components/web_view/public/interfaces/frame.mojom.h" |
| 15 #include "mojo/services/network/public/interfaces/url_loader.mojom.h" | 15 #include "mojo/services/network/public/interfaces/url_loader.mojom.h" |
| 16 | 16 |
| 17 namespace mojo { | 17 namespace mojo { |
| 18 class ApplicationConnection; | 18 class ApplicationConnection; |
| 19 class ApplicationImpl; | 19 class ApplicationImpl; |
| 20 } | 20 } |
| 21 | 21 |
| (...skipping 24 matching lines...) Expand all Loading... |
| 46 void Init(mojo::ApplicationImpl* app, | 46 void Init(mojo::ApplicationImpl* app, |
| 47 mojo::URLRequestPtr request, | 47 mojo::URLRequestPtr request, |
| 48 const base::Closure& on_got_id_callback); | 48 const base::Closure& on_got_id_callback); |
| 49 | 49 |
| 50 mojom::FrameClient* frame_client() { return frame_client_.get(); } | 50 mojom::FrameClient* frame_client() { return frame_client_.get(); } |
| 51 | 51 |
| 52 mojo::ApplicationConnection* application_connection() { | 52 mojo::ApplicationConnection* application_connection() { |
| 53 return application_connection_.get(); | 53 return application_connection_.get(); |
| 54 } | 54 } |
| 55 | 55 |
| 56 // Asks the remote application for a ViewTreeClient. | 56 // Asks the remote application for a WindowTreeClient. |
| 57 mojo::ViewTreeClientPtr GetViewTreeClient(); | 57 mus::mojom::WindowTreeClientPtr GetWindowTreeClient(); |
| 58 | 58 |
| 59 // Returns the id of the content handler app. Only available once the callback | 59 // Returns the id of the content handler app. Only available once the callback |
| 60 // has run. | 60 // has run. |
| 61 uint32_t GetContentHandlerID() const; | 61 uint32_t GetContentHandlerID() const; |
| 62 | 62 |
| 63 private: | 63 private: |
| 64 mojom::FrameClientPtr frame_client_; | 64 mojom::FrameClientPtr frame_client_; |
| 65 | 65 |
| 66 scoped_ptr<mojo::ApplicationConnection> application_connection_; | 66 scoped_ptr<mojo::ApplicationConnection> application_connection_; |
| 67 | 67 |
| 68 DISALLOW_COPY_AND_ASSIGN(FrameConnection); | 68 DISALLOW_COPY_AND_ASSIGN(FrameConnection); |
| 69 }; | 69 }; |
| 70 | 70 |
| 71 } // namespace web_view | 71 } // namespace web_view |
| 72 | 72 |
| 73 #endif // COMPONENTS_WEB_VIEW_FRAME_CONNECTION_H_ | 73 #endif // COMPONENTS_WEB_VIEW_FRAME_CONNECTION_H_ |
| OLD | NEW |