diff options
| author | ben <ben@chromium.org> | 2015-08-27 11:39:50 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-27 18:40:38 +0000 |
| commit | bb2ede5eec3754ddf8110f743db82644459d16a3 (patch) | |
| tree | 48eae52bfe5598e7ff83f84c08b1907bdde80166 /mandoline/tab | |
| parent | 75a066734bc82f27dc8a9f6d9069c64a32a94b14 (diff) | |
| download | chromium_src-bb2ede5eec3754ddf8110f743db82644459d16a3.zip chromium_src-bb2ede5eec3754ddf8110f743db82644459d16a3.tar.gz chromium_src-bb2ede5eec3754ddf8110f743db82644459d16a3.tar.bz2 | |
ViewManagerRoot -> ViewTreeHost
Also adds ViewTreeHostFactory.
ViewManagerInit->ViewTreeHostConnection.
Currently ViewManagerInit still performs the initial connection to the view manager. It might be ideal to have it only wrap a single ViewTreeHost, but I'll get to that later.
R=sky@chromium.org
BUG=none
Review URL: https://codereview.chromium.org/1306193005
Cr-Commit-Position: refs/heads/master@{#345934}
Diffstat (limited to 'mandoline/tab')
| -rw-r--r-- | mandoline/tab/frame_apptest.cc | 10 | ||||
| -rw-r--r-- | mandoline/tab/frame_connection.cc | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/mandoline/tab/frame_apptest.cc b/mandoline/tab/frame_apptest.cc index dc3b67d..48c1631 100644 --- a/mandoline/tab/frame_apptest.cc +++ b/mandoline/tab/frame_apptest.cc @@ -10,10 +10,10 @@ #include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "base/test/test_timeouts.h" -#include "components/view_manager/public/cpp/view_manager_init.h" #include "components/view_manager/public/cpp/view_observer.h" #include "components/view_manager/public/cpp/view_tree_connection.h" #include "components/view_manager/public/cpp/view_tree_delegate.h" +#include "components/view_manager/public/cpp/view_tree_host_connection.h" #include "mandoline/tab/frame.h" #include "mandoline/tab/frame_tree.h" #include "mandoline/tab/frame_tree_delegate.h" @@ -98,15 +98,15 @@ class FrameTest : public mojo::test::ApplicationTestBase, void SetUp() override { ApplicationTestBase::SetUp(); - view_manager_init_.reset( - new mojo::ViewManagerInit(application_impl(), this, nullptr)); + host_connection_.reset( + new mojo::ViewTreeHostConnection(application_impl(), this, nullptr)); ASSERT_TRUE(DoRunLoopWithTimeout()); std::swap(window_manager_, most_recent_connection_); } // Overridden from testing::Test: void TearDown() override { - view_manager_init_.reset(); // Uses application_impl() from base class. + host_connection_.reset(); // Uses application_impl() from base class. ApplicationTestBase::TearDown(); } @@ -117,7 +117,7 @@ class FrameTest : public mojo::test::ApplicationTestBase, mojo::ViewTreeConnection::Create(this, request.Pass()); } - scoped_ptr<mojo::ViewManagerInit> view_manager_init_; + scoped_ptr<mojo::ViewTreeHostConnection> host_connection_; // Used to receive the most recent view manager loaded by an embed action. ViewTreeConnection* most_recent_connection_; diff --git a/mandoline/tab/frame_connection.cc b/mandoline/tab/frame_connection.cc index cc5b36f..35be588 100644 --- a/mandoline/tab/frame_connection.cc +++ b/mandoline/tab/frame_connection.cc @@ -8,7 +8,7 @@ #include "components/resource_provider/public/interfaces/resource_provider.mojom.h" #include "components/view_manager/public/interfaces/gpu.mojom.h" #include "components/view_manager/public/interfaces/surfaces.mojom.h" -#include "components/view_manager/public/interfaces/view_manager_root.mojom.h" +#include "components/view_manager/public/interfaces/view_tree_host.mojom.h" #include "mojo/application/public/cpp/application_connection.h" #include "mojo/application/public/cpp/application_impl.h" #include "mojo/services/network/public/interfaces/cookie_store.mojom.h" @@ -57,7 +57,7 @@ void FrameConnection::Init(mojo::ApplicationImpl* app, mojo::Array<mojo::String> view_manager_interfaces; view_manager_interfaces.push_back(mojo::Gpu::Name_); - view_manager_interfaces.push_back(mojo::ViewManagerRoot::Name_); + view_manager_interfaces.push_back(mojo::ViewTreeHostFactory::Name_); view_manager_interfaces.push_back(mojo::Surface::Name_); filter->filter.insert("mojo:view_manager", view_manager_interfaces.Pass()); |