| 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 <stddef.h> | 7 #include <stddef.h> |
| 8 #include <algorithm> | 8 #include <algorithm> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| 11 #include "base/auto_reset.h" | 11 #include "base/auto_reset.h" |
| 12 #include "base/bind.h" | 12 #include "base/bind.h" |
| 13 #include "base/callback.h" | 13 #include "base/callback.h" |
| 14 #include "base/stl_util.h" | 14 #include "base/stl_util.h" |
| 15 #include "base/trace_event/trace_event.h" | 15 #include "base/trace_event/trace_event.h" |
| 16 #include "components/mus/public/cpp/window.h" | 16 #include "components/mus/public/cpp/window.h" |
| 17 #include "components/mus/public/cpp/window_property.h" | 17 #include "components/mus/public/cpp/window_property.h" |
| 18 #include "components/web_view/frame_tree.h" | 18 #include "components/web_view/frame_tree.h" |
| 19 #include "components/web_view/frame_tree_delegate.h" | 19 #include "components/web_view/frame_tree_delegate.h" |
| 20 #include "components/web_view/frame_user_data.h" | 20 #include "components/web_view/frame_user_data.h" |
| 21 #include "components/web_view/frame_utils.h" | 21 #include "components/web_view/frame_utils.h" |
| 22 #include "mojo/application/public/interfaces/shell.mojom.h" | |
| 23 #include "mojo/common/url_type_converters.h" | 22 #include "mojo/common/url_type_converters.h" |
| 23 #include "mojo/shell/public/interfaces/shell.mojom.h" |
| 24 #include "url/gurl.h" | 24 #include "url/gurl.h" |
| 25 | 25 |
| 26 using mus::Window; | 26 using mus::Window; |
| 27 | 27 |
| 28 DECLARE_WINDOW_PROPERTY_TYPE(web_view::Frame*); | 28 DECLARE_WINDOW_PROPERTY_TYPE(web_view::Frame*); |
| 29 | 29 |
| 30 namespace web_view { | 30 namespace web_view { |
| 31 | 31 |
| 32 // Used to find the Frame associated with a Window. | 32 // Used to find the Frame associated with a Window. |
| 33 DEFINE_LOCAL_WINDOW_PROPERTY_KEY(Frame*, kFrame, nullptr); | 33 DEFINE_LOCAL_WINDOW_PROPERTY_KEY(Frame*, kFrame, nullptr); |
| (...skipping 566 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 600 final_update); | 600 final_update); |
| 601 } | 601 } |
| 602 | 602 |
| 603 void Frame::OnFindInPageSelectionUpdated(int32_t request_id, | 603 void Frame::OnFindInPageSelectionUpdated(int32_t request_id, |
| 604 int32_t active_match_ordinal) { | 604 int32_t active_match_ordinal) { |
| 605 tree_->delegate_->OnFindInPageSelectionUpdated(request_id, this, | 605 tree_->delegate_->OnFindInPageSelectionUpdated(request_id, this, |
| 606 active_match_ordinal); | 606 active_match_ordinal); |
| 607 } | 607 } |
| 608 | 608 |
| 609 } // namespace web_view | 609 } // namespace web_view |
| OLD | NEW |