| 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_WEB_VIEW_IMPL_H_ | 5 #ifndef COMPONENTS_WEB_VIEW_WEB_VIEW_IMPL_H_ |
| 6 #define COMPONENTS_WEB_VIEW_WEB_VIEW_IMPL_H_ | 6 #define COMPONENTS_WEB_VIEW_WEB_VIEW_IMPL_H_ |
| 7 | 7 |
| 8 #include <string> |
| 9 |
| 8 #include "base/macros.h" | 10 #include "base/macros.h" |
| 9 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 10 #include "components/mus/public/cpp/view_observer.h" | 12 #include "components/mus/public/cpp/view_observer.h" |
| 11 #include "components/mus/public/cpp/view_tree_delegate.h" | 13 #include "components/mus/public/cpp/view_tree_delegate.h" |
| 12 #include "components/web_view/frame_devtools_agent_delegate.h" | 14 #include "components/web_view/frame_devtools_agent_delegate.h" |
| 13 #include "components/web_view/frame_tree_delegate.h" | 15 #include "components/web_view/frame_tree_delegate.h" |
| 14 #include "components/web_view/navigation_controller.h" | 16 #include "components/web_view/navigation_controller.h" |
| 15 #include "components/web_view/navigation_controller_delegate.h" | 17 #include "components/web_view/navigation_controller_delegate.h" |
| 16 #include "components/web_view/public/interfaces/web_view.mojom.h" | 18 #include "components/web_view/public/interfaces/web_view.mojom.h" |
| 17 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" | 19 #include "third_party/mojo/src/mojo/public/cpp/bindings/strong_binding.h" |
| (...skipping 20 matching lines...) Expand all Loading... |
| 38 public: | 40 public: |
| 39 WebViewImpl(mojo::ApplicationImpl* app, | 41 WebViewImpl(mojo::ApplicationImpl* app, |
| 40 mojom::WebViewClientPtr client, | 42 mojom::WebViewClientPtr client, |
| 41 mojo::InterfaceRequest<WebView> request); | 43 mojo::InterfaceRequest<WebView> request); |
| 42 ~WebViewImpl() override; | 44 ~WebViewImpl() override; |
| 43 | 45 |
| 44 private: | 46 private: |
| 45 friend class PendingWebViewLoad; | 47 friend class PendingWebViewLoad; |
| 46 | 48 |
| 47 // See description above |pending_load_| for details. | 49 // See description above |pending_load_| for details. |
| 48 void OnLoad(); | 50 void OnLoad(const std::string& pending_url); |
| 49 | 51 |
| 50 // Overridden from WebView: | 52 // Overridden from WebView: |
| 51 void LoadRequest(mojo::URLRequestPtr request) override; | 53 void LoadRequest(mojo::URLRequestPtr request) override; |
| 52 void GetViewTreeClient( | 54 void GetViewTreeClient( |
| 53 mojo::InterfaceRequest<mojo::ViewTreeClient> view_tree_client) | 55 mojo::InterfaceRequest<mojo::ViewTreeClient> view_tree_client) |
| 54 override; | 56 override; |
| 55 void GoBack() override; | 57 void GoBack() override; |
| 56 void GoForward() override; | 58 void GoForward() override; |
| 57 | 59 |
| 58 // Overridden from mus::ViewTreeDelegate: | 60 // Overridden from mus::ViewTreeDelegate: |
| (...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 102 scoped_ptr<FrameDevToolsAgent> devtools_agent_; | 104 scoped_ptr<FrameDevToolsAgent> devtools_agent_; |
| 103 | 105 |
| 104 NavigationController navigation_controller_; | 106 NavigationController navigation_controller_; |
| 105 | 107 |
| 106 DISALLOW_COPY_AND_ASSIGN(WebViewImpl); | 108 DISALLOW_COPY_AND_ASSIGN(WebViewImpl); |
| 107 }; | 109 }; |
| 108 | 110 |
| 109 } // namespace web_view | 111 } // namespace web_view |
| 110 | 112 |
| 111 #endif // COMPONENTS_WEB_VIEW_WEB_VIEW_IMPL_H_ | 113 #endif // COMPONENTS_WEB_VIEW_WEB_VIEW_IMPL_H_ |
| OLD | NEW |