diff options
| author | fsamuel <fsamuel@chromium.org> | 2015-10-17 19:51:17 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-18 02:51:50 +0000 |
| commit | a8ad3fe360014c80a2203138e0f569c9d4dd1200 (patch) | |
| tree | 6dae159e03162ad5c806f256ae0d062ffe06fae8 /components/web_view | |
| parent | 0c9712376e74c145db99b5b572b9495ff920247b (diff) | |
| download | chromium_src-a8ad3fe360014c80a2203138e0f569c9d4dd1200.zip chromium_src-a8ad3fe360014c80a2203138e0f569c9d4dd1200.tar.gz chromium_src-a8ad3fe360014c80a2203138e0f569c9d4dd1200.tar.bz2 | |
mus: CreateWindow => NewWindow
The method name CreateWindow is very brittle on Windows because there's a macro
that maps CreateWindow to CreateWindowW there. This CL renames CreateWindow to
NewWindow
BUG=542848
TBR=ben@chromium.org
R=ben@chromium.org
Review URL: https://codereview.chromium.org/1409413002
Cr-Commit-Position: refs/heads/master@{#354696}
Diffstat (limited to 'components/web_view')
| -rw-r--r-- | components/web_view/frame_apptest.cc | 4 | ||||
| -rw-r--r-- | components/web_view/test_runner/test_runner_application_delegate.cc | 2 | ||||
| -rw-r--r-- | components/web_view/web_view_apptest.cc | 2 | ||||
| -rw-r--r-- | components/web_view/web_view_impl.cc | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/components/web_view/frame_apptest.cc b/components/web_view/frame_apptest.cc index 2b32946..10bbd3e 100644 --- a/components/web_view/frame_apptest.cc +++ b/components/web_view/frame_apptest.cc @@ -321,7 +321,7 @@ class FrameTest : public mojo::test::ApplicationTestBase, // Creates a new shared frame as a child of |parent|. scoped_ptr<ViewAndFrame> CreateChildViewAndFrame(ViewAndFrame* parent) { mus::Window* child_frame_view = - parent->view()->connection()->CreateWindow(); + parent->view()->connection()->NewWindow(); parent->view()->AddChild(child_frame_view); scoped_ptr<ViewAndFrame> view_and_frame(new ViewAndFrame); @@ -382,7 +382,7 @@ class FrameTest : public mojo::test::ApplicationTestBase, mojom::FrameClient* frame_client = frame_connection->frame_client(); mus::mojom::WindowTreeClientPtr view_tree_client = frame_connection->GetWindowTreeClient(); - mus::Window* frame_root_view = window_manager()->CreateWindow(); + mus::Window* frame_root_view = window_manager()->NewWindow(); window_manager()->GetRoot()->AddChild(frame_root_view); frame_tree_.reset(new FrameTree( 0u, frame_root_view, view_tree_client.Pass(), diff --git a/components/web_view/test_runner/test_runner_application_delegate.cc b/components/web_view/test_runner/test_runner_application_delegate.cc index 76e5bc4..bb239c3 100644 --- a/components/web_view/test_runner/test_runner_application_delegate.cc +++ b/components/web_view/test_runner/test_runner_application_delegate.cc @@ -94,7 +94,7 @@ void TestRunnerApplicationDelegate::OnEmbed(mus::Window* root) { const gfx::Size kViewportSize(800, 600); host_->SetSize(mojo::Size::From(kViewportSize)); - content_ = root_->connection()->CreateWindow(); + content_ = root_->connection()->NewWindow(); root_->AddChild(content_); content_->SetBounds(*mojo::Rect::From(gfx::Rect(kViewportSize))); content_->SetVisible(true); diff --git a/components/web_view/web_view_apptest.cc b/components/web_view/web_view_apptest.cc index 63e42da..9408fc4 100644 --- a/components/web_view/web_view_apptest.cc +++ b/components/web_view/web_view_apptest.cc @@ -100,7 +100,7 @@ class WebViewTest : public mus::WindowServerTestBase, // Overridden from ViewTreeDelegate: void OnEmbed(mus::Window* root) override { - content_ = root->connection()->CreateWindow(); + content_ = root->connection()->NewWindow(); content_->SetBounds(root->bounds()); root->AddChild(content_); content_->SetVisible(true); diff --git a/components/web_view/web_view_impl.cc b/components/web_view/web_view_impl.cc index 24f771f..49e41b8 100644 --- a/components/web_view/web_view_impl.cc +++ b/components/web_view/web_view_impl.cc @@ -74,7 +74,7 @@ void WebViewImpl::OnLoad(const GURL& pending_url) { client_->TopLevelNavigationStarted(pending_url.spec()); - content_ = root_->connection()->CreateWindow(); + content_ = root_->connection()->NewWindow(); content_->SetBounds(*mojo::Rect::From( gfx::Rect(0, 0, root_->bounds().width, root_->bounds().height))); root_->AddChild(content_); |