| 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 #include "components/web_view/frame.h" | 5 #include "components/web_view/frame.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 | 8 |
| 9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
| 10 #include "base/bind.h" | 10 #include "base/bind.h" |
| 11 #include "base/callback.h" | 11 #include "base/callback.h" |
| 12 #include "base/stl_util.h" | 12 #include "base/stl_util.h" |
| 13 #include "components/view_manager/public/cpp/view.h" | 13 #include "components/mus/public/cpp/view.h" |
| 14 #include "components/view_manager/public/cpp/view_property.h" | 14 #include "components/mus/public/cpp/view_property.h" |
| 15 #include "components/web_view/frame_tree.h" | 15 #include "components/web_view/frame_tree.h" |
| 16 #include "components/web_view/frame_tree_delegate.h" | 16 #include "components/web_view/frame_tree_delegate.h" |
| 17 #include "components/web_view/frame_user_data.h" | 17 #include "components/web_view/frame_user_data.h" |
| 18 #include "components/web_view/frame_utils.h" | 18 #include "components/web_view/frame_utils.h" |
| 19 #include "mojo/application/public/interfaces/shell.mojom.h" | 19 #include "mojo/application/public/interfaces/shell.mojom.h" |
| 20 | 20 |
| 21 using mojo::View; | 21 using mojo::View; |
| 22 | 22 |
| 23 DECLARE_VIEW_PROPERTY_TYPE(web_view::Frame*); | 23 DECLARE_VIEW_PROPERTY_TYPE(web_view::Frame*); |
| 24 | 24 |
| (...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 529 // Else case if |target_frame| == root. Treat at top level request. | 529 // Else case if |target_frame| == root. Treat at top level request. |
| 530 } | 530 } |
| 531 tree_->delegate_->NavigateTopLevel(this, request.Pass()); | 531 tree_->delegate_->NavigateTopLevel(this, request.Pass()); |
| 532 } | 532 } |
| 533 | 533 |
| 534 void Frame::DidNavigateLocally(uint32_t frame_id, const mojo::String& url) { | 534 void Frame::DidNavigateLocally(uint32_t frame_id, const mojo::String& url) { |
| 535 NOTIMPLEMENTED(); | 535 NOTIMPLEMENTED(); |
| 536 } | 536 } |
| 537 | 537 |
| 538 } // namespace web_view | 538 } // namespace web_view |
| OLD | NEW |