Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(302)

Unified Diff: components/web_view/web_view_impl.cc

Issue 1347023003: Rename frame classes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge 2 trunk Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « components/web_view/web_view_impl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/web_view/web_view_impl.cc
diff --git a/components/web_view/web_view_impl.cc b/components/web_view/web_view_impl.cc
index 84675d14f52f6670d1f8c0b979dd63f8bf2fd6c1..03264963ac24fb39b7271216667b518bdef9b458 100644
--- a/components/web_view/web_view_impl.cc
+++ b/components/web_view/web_view_impl.cc
@@ -74,11 +74,11 @@ void WebViewImpl::OnLoad() {
devtools_agent_->AttachFrame(forward_agent.Pass(), &client_properties);
}
- FrameTreeClient* frame_tree_client = frame_connection->frame_tree_client();
+ mojom::FrameClient* frame_client = frame_connection->frame_client();
const uint32_t content_handler_id = frame_connection->GetContentHandlerID();
- frame_tree_.reset(new FrameTree(
- content_handler_id, content_, view_tree_client.Pass(), this,
- frame_tree_client, frame_connection.Pass(), client_properties));
+ frame_tree_.reset(new FrameTree(content_handler_id, content_,
+ view_tree_client.Pass(), this, frame_client,
+ frame_connection.Pass(), client_properties));
}
////////////////////////////////////////////////////////////////////////////////
@@ -155,14 +155,14 @@ void WebViewImpl::OnViewDestroyed(mus::View* view) {
// WebViewImpl, FrameTreeDelegate implementation:
scoped_ptr<FrameUserData> WebViewImpl::CreateUserDataForNewFrame(
- FrameTreeClientPtr frame_tree_client) {
+ mojom::FrameClientPtr frame_client) {
return make_scoped_ptr(
- new ClientInitiatedFrameConnection(frame_tree_client.Pass()));
+ new ClientInitiatedFrameConnection(frame_client.Pass()));
}
bool WebViewImpl::CanPostMessageEventToFrame(const Frame* source,
const Frame* target,
- HTMLMessageEvent* event) {
+ mojom::HTMLMessageEvent* event) {
return true;
}
« no previous file with comments | « components/web_view/web_view_impl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698