From bafedfb8f61bdb8803e4c3bfa1dbfb7e8cf04001 Mon Sep 17 00:00:00 2001 From: Scott Violet Date: Fri, 19 Dec 2014 07:45:16 -0800 Subject: [PATCH] Moves Create() off of View and onto ViewManager This makes more sense given the ViewManager is used to create the view. R=ben@chromium.org Review URL: https://codereview.chromium.org/818583002 --- tools/debugger/debugger.cc | 2 +- tools/tester/tester.cc | 2 +- viewer/document_view.cc | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/debugger/debugger.cc b/tools/debugger/debugger.cc index 2a19cbbd6d3..54d874e0c0d 100644 --- a/tools/debugger/debugger.cc +++ b/tools/debugger/debugger.cc @@ -52,7 +52,7 @@ void SkyDebugger::OnEmbed( window_manager_app_->SetViewportSize(gfx::Size(320, 640)); - content_ = mojo::View::Create(root->view_manager()); + content_ = root->view_manager()->CreateView(); content_->SetBounds(root_->bounds()); root_->AddChild(content_); content_->SetVisible(true); diff --git a/tools/tester/tester.cc b/tools/tester/tester.cc index c816d006c9d..635bc6b1a53 100644 --- a/tools/tester/tester.cc +++ b/tools/tester/tester.cc @@ -90,7 +90,7 @@ class SkyTester : public mojo::ApplicationDelegate, root_ = root; root_->AddObserver(this); - content_ = mojo::View::Create(root->view_manager()); + content_ = root->view_manager()->CreateView(); content_->SetBounds(root_->bounds()); root_->AddChild(content_); content_->SetVisible(true); diff --git a/viewer/document_view.cc b/viewer/document_view.cc index 095cfeff348..b8a9a22ac3e 100644 --- a/viewer/document_view.cc +++ b/viewer/document_view.cc @@ -16,6 +16,7 @@ #include "mojo/public/interfaces/application/shell.mojom.h" #include "mojo/services/surfaces/public/interfaces/surfaces_service.mojom.h" #include "mojo/services/view_manager/public/cpp/view.h" +#include "mojo/services/view_manager/public/cpp/view_manager.h" #include "skia/ext/refptr.h" #include "sky/compositor/layer.h" #include "sky/compositor/layer_host.h" @@ -172,7 +173,7 @@ mojo::View* DocumentView::createChildFrame(const blink::WebURL& url) { if (!root_) return nullptr; - mojo::View* child = mojo::View::Create(root_->view_manager()); + mojo::View* child = root_->view_manager()->CreateView(); child->SetVisible(true); root_->AddChild(child); child->Embed(mojo::String::From(url.string().utf8()));