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 /mandoline/ui | |
| 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 'mandoline/ui')
| -rw-r--r-- | mandoline/ui/desktop_ui/browser_window.cc | 4 | ||||
| -rw-r--r-- | mandoline/ui/phone_ui/phone_browser_application_delegate.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mandoline/ui/desktop_ui/browser_window.cc b/mandoline/ui/desktop_ui/browser_window.cc index 3fe21a7..3195be3 100644 --- a/mandoline/ui/desktop_ui/browser_window.cc +++ b/mandoline/ui/desktop_ui/browser_window.cc @@ -165,7 +165,7 @@ void BrowserWindow::OnEmbed(mus::Window* root) { host_->SetTitle("Mandoline"); - content_ = root_->connection()->CreateWindow(); + content_ = root_->connection()->NewWindow(); Init(root_); host_->SetSize(mojo::Size::From(gfx::Size(1280, 800))); @@ -375,7 +375,7 @@ void BrowserWindow::Init(mus::Window* root) { aura_init_.reset(new views::AuraInit(app_, "mandoline_ui.pak", root)); root_ = root; - omnibox_view_ = root_->connection()->CreateWindow(); + omnibox_view_ = root_->connection()->NewWindow(); root_->AddChild(omnibox_view_); views::WidgetDelegateView* widget_delegate = new views::WidgetDelegateView; diff --git a/mandoline/ui/phone_ui/phone_browser_application_delegate.cc b/mandoline/ui/phone_ui/phone_browser_application_delegate.cc index ef3758d..367d82b 100644 --- a/mandoline/ui/phone_ui/phone_browser_application_delegate.cc +++ b/mandoline/ui/phone_ui/phone_browser_application_delegate.cc @@ -71,7 +71,7 @@ void PhoneBrowserApplicationDelegate::LaunchURL(const mojo::String& url) { void PhoneBrowserApplicationDelegate::OnEmbed(mus::Window* root) { CHECK(!root_); root_ = root; - content_ = root->connection()->CreateWindow(); + content_ = root->connection()->NewWindow(); root->AddChild(content_); content_->SetBounds(root->bounds()); content_->SetVisible(true); |