diff options
| author | ben <ben@chromium.org> | 2015-08-25 21:47:57 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-26 04:48:37 +0000 |
| commit | 6990b88279d59405f557b306d74df738c5ad6cf1 (patch) | |
| tree | c214e56f1c986819ae4395fad8ff5ede4f7f323c /mandoline/ui/phone_ui | |
| parent | 5e7aec4faea108b6e64ee6a4712e77ca5b43e3c7 (diff) | |
| download | chromium_src-6990b88279d59405f557b306d74df738c5ad6cf1.zip chromium_src-6990b88279d59405f557b306d74df738c5ad6cf1.tar.gz chromium_src-6990b88279d59405f557b306d74df738c5ad6cf1.tar.bz2 | |
Rename ViewManager -> ViewTreeConnection
R=sky@chromium.org
BUG=none
Review URL: https://codereview.chromium.org/1313123007
Cr-Commit-Position: refs/heads/master@{#345542}
Diffstat (limited to 'mandoline/ui/phone_ui')
| -rw-r--r-- | mandoline/ui/phone_ui/phone_browser_application_delegate.cc | 12 | ||||
| -rw-r--r-- | mandoline/ui/phone_ui/phone_browser_application_delegate.h | 8 |
2 files changed, 10 insertions, 10 deletions
diff --git a/mandoline/ui/phone_ui/phone_browser_application_delegate.cc b/mandoline/ui/phone_ui/phone_browser_application_delegate.cc index ea748c9..f56f16d 100644 --- a/mandoline/ui/phone_ui/phone_browser_application_delegate.cc +++ b/mandoline/ui/phone_ui/phone_browser_application_delegate.cc @@ -5,8 +5,8 @@ #include "mandoline/ui/phone_ui/phone_browser_application_delegate.h" #include "components/view_manager/public/cpp/view.h" -#include "components/view_manager/public/cpp/view_manager.h" #include "components/view_manager/public/cpp/view_manager_init.h" +#include "components/view_manager/public/cpp/view_tree_connection.h" #include "mojo/application/public/cpp/application_connection.h" #include "mojo/converters/geometry/geometry_type_converters.h" #include "mojo/services/network/public/interfaces/url_loader.mojom.h" @@ -53,11 +53,11 @@ void PhoneBrowserApplicationDelegate::LaunchURL(const mojo::String& url) { } //////////////////////////////////////////////////////////////////////////////// -// PhoneBrowserApplicationDelegate, mojo::ViewManagerDelegate implementation: +// PhoneBrowserApplicationDelegate, mojo::ViewTreeDelegate implementation: void PhoneBrowserApplicationDelegate::OnEmbed(mojo::View* root) { - root->view_manager()->SetEmbedRoot(); - content_ = root->view_manager()->CreateView(); + root->connection()->SetEmbedRoot(); + content_ = root->connection()->CreateView(); root->AddChild(content_); content_->SetBounds(root->bounds()); content_->SetVisible(true); @@ -68,8 +68,8 @@ void PhoneBrowserApplicationDelegate::OnEmbed(mojo::View* root) { LaunchURL("http://www.google.com/"); } -void PhoneBrowserApplicationDelegate::OnViewManagerDestroyed( - mojo::ViewManager* view_manager) { +void PhoneBrowserApplicationDelegate::OnConnectionLost( + mojo::ViewTreeConnection* connection) { } //////////////////////////////////////////////////////////////////////////////// diff --git a/mandoline/ui/phone_ui/phone_browser_application_delegate.h b/mandoline/ui/phone_ui/phone_browser_application_delegate.h index 60018c6..dd49e6d 100644 --- a/mandoline/ui/phone_ui/phone_browser_application_delegate.h +++ b/mandoline/ui/phone_ui/phone_browser_application_delegate.h @@ -7,8 +7,8 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" -#include "components/view_manager/public/cpp/view_manager_delegate.h" #include "components/view_manager/public/cpp/view_observer.h" +#include "components/view_manager/public/cpp/view_tree_delegate.h" #include "mandoline/tab/public/cpp/web_view.h" #include "mandoline/tab/public/interfaces/web_view.mojom.h" // TODO(beng): move this file somewhere common. @@ -27,7 +27,7 @@ namespace mandoline { class PhoneBrowserApplicationDelegate : public mojo::ApplicationDelegate, public LaunchHandler, - public mojo::ViewManagerDelegate, + public mojo::ViewTreeDelegate, public mojo::ViewObserver, public web_view::mojom::WebViewClient, public mojo::InterfaceFactory<LaunchHandler> { @@ -44,9 +44,9 @@ class PhoneBrowserApplicationDelegate : // Overridden from LaunchHandler: void LaunchURL(const mojo::String& url) override; - // Overridden from mojo::ViewManagerDelegate: + // Overridden from mojo::ViewTreeDelegate: void OnEmbed(mojo::View* root) override; - void OnViewManagerDestroyed(mojo::ViewManager* view_manager) override; + void OnConnectionLost(mojo::ViewTreeConnection* connection) override; // Overridden from mojo::ViewObserver: void OnViewBoundsChanged(mojo::View* view, |