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

Unified Diff: components/html_viewer/html_frame_apptest.cc

Issue 1314953002: Rename ViewManagerService,ViewManagerClient -> ViewTree,ViewTreeClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years, 4 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/html_viewer/html_document_oopif.cc ('k') | components/pdf_viewer/pdf_viewer.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/html_viewer/html_frame_apptest.cc
diff --git a/components/html_viewer/html_frame_apptest.cc b/components/html_viewer/html_frame_apptest.cc
index ef0e18fc1b8afaeb55581038ddbf732b2d020068..a506d7bb84c041de2b0d050f53bbaa34937a7b79 100644
--- a/components/html_viewer/html_frame_apptest.cc
+++ b/components/html_viewer/html_frame_apptest.cc
@@ -106,9 +106,9 @@ class TestFrameTreeDelegateImpl : public mandoline::TestFrameTreeDelegate {
mojo::URLRequestPtr request,
mandoline::FrameTreeClient** frame_tree_client,
scoped_ptr<mandoline::FrameUserData>* frame_user_data,
- mojo::ViewManagerClientPtr* view_manager_client) override {
+ mojo::ViewTreeClientPtr* tree_client) override {
scoped_ptr<FrameConnection> frame_connection(new FrameConnection);
- frame_connection->Init(app_, request.Pass(), view_manager_client);
+ frame_connection->Init(app_, request.Pass(), tree_client);
*frame_tree_client = frame_connection->frame_tree_client();
*frame_user_data = frame_connection.Pass();
@@ -196,16 +196,16 @@ class HTMLFrameTest : public ViewManagerTestBase {
new TestFrameTreeDelegateImpl(application_impl()));
scoped_ptr<FrameConnection> frame_connection(new FrameConnection);
FrameConnection* result = frame_connection.get();
- ViewManagerClientPtr view_manager_client;
+ ViewTreeClientPtr tree_client;
frame_connection->Init(application_impl(), BuildRequestForURL(url_string),
- &view_manager_client);
+ &tree_client);
FrameTreeClient* frame_tree_client = frame_connection->frame_tree_client();
frame_tree_.reset(new FrameTree(view, frame_tree_delegate_.get(),
frame_tree_client,
frame_connection.Pass(),
Frame::ClientPropertyMap()));
frame_tree_delegate_->set_frame_tree(frame_tree_.get());
- view->Embed(view_manager_client.Pass());
+ view->Embed(tree_client.Pass());
return result;
}
« no previous file with comments | « components/html_viewer/html_document_oopif.cc ('k') | components/pdf_viewer/pdf_viewer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698