| 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 <stdint.h> |
| 9 |
| 9 #include "base/callback.h" | 10 #include "base/callback.h" |
| 11 #include "base/macros.h" |
| 10 #include "base/memory/scoped_ptr.h" | 12 #include "base/memory/scoped_ptr.h" |
| 11 #include "components/mus/public/interfaces/window_tree.mojom.h" | 13 #include "components/mus/public/interfaces/window_tree.mojom.h" |
| 12 #include "components/web_view/frame_tree_delegate.h" | 14 #include "components/web_view/frame_tree_delegate.h" |
| 13 #include "components/web_view/frame_user_data.h" | 15 #include "components/web_view/frame_user_data.h" |
| 14 #include "components/web_view/public/interfaces/frame.mojom.h" | 16 #include "components/web_view/public/interfaces/frame.mojom.h" |
| 15 #include "mojo/services/network/public/interfaces/url_loader.mojom.h" | 17 #include "mojo/services/network/public/interfaces/url_loader.mojom.h" |
| 16 | 18 |
| 17 namespace mojo { | 19 namespace mojo { |
| 18 class ApplicationConnection; | 20 class ApplicationConnection; |
| 19 class ApplicationImpl; | 21 class ApplicationImpl; |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 64 mojom::FrameClientPtr frame_client_; | 66 mojom::FrameClientPtr frame_client_; |
| 65 | 67 |
| 66 scoped_ptr<mojo::ApplicationConnection> application_connection_; | 68 scoped_ptr<mojo::ApplicationConnection> application_connection_; |
| 67 | 69 |
| 68 DISALLOW_COPY_AND_ASSIGN(FrameConnection); | 70 DISALLOW_COPY_AND_ASSIGN(FrameConnection); |
| 69 }; | 71 }; |
| 70 | 72 |
| 71 } // namespace web_view | 73 } // namespace web_view |
| 72 | 74 |
| 73 #endif // COMPONENTS_WEB_VIEW_FRAME_CONNECTION_H_ | 75 #endif // COMPONENTS_WEB_VIEW_FRAME_CONNECTION_H_ |
| OLD | NEW |