diff options
| author | sky <sky@chromium.org> | 2015-10-27 16:27:25 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-27 23:28:02 +0000 |
| commit | 40766911c1bccdb7ee615616fc9377abe121b308 (patch) | |
| tree | c21a40e2f6a5ae87d0a0fcff848c5ee86429483d /mandoline | |
| parent | 264cfee9b62e45188258fb11d50739a6a0c33424 (diff) | |
| download | chromium_src-40766911c1bccdb7ee615616fc9377abe121b308.zip chromium_src-40766911c1bccdb7ee615616fc9377abe121b308.tar.gz chromium_src-40766911c1bccdb7ee615616fc9377abe121b308.tar.bz2 | |
Routes calls to WM through WS
By doing this we ensure the WM sees changes to the underlying windows
before any calls to the WM are received.
BUG=none
TEST=none
R=ben@chromium.org
Review URL: https://codereview.chromium.org/1423133003
Cr-Commit-Position: refs/heads/master@{#356429}
Diffstat (limited to 'mandoline')
| -rw-r--r-- | mandoline/ui/desktop_ui/browser_window.cc | 3 | ||||
| -rw-r--r-- | mandoline/ui/phone_ui/phone_browser_application_delegate.cc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mandoline/ui/desktop_ui/browser_window.cc b/mandoline/ui/desktop_ui/browser_window.cc index d51f0ea..38e4edc 100644 --- a/mandoline/ui/desktop_ui/browser_window.cc +++ b/mandoline/ui/desktop_ui/browser_window.cc @@ -86,7 +86,8 @@ BrowserWindow::BrowserWindow(mojo::ApplicationImpl* app, web_view_(this) { mus::mojom::WindowTreeHostClientPtr host_client; host_client_binding_.Bind(GetProxy(&host_client)); - mus::CreateWindowTreeHost(host_factory, host_client.Pass(), this, &host_); + mus::CreateWindowTreeHost(host_factory, host_client.Pass(), this, &host_, + nullptr); } void BrowserWindow::LoadURL(const GURL& url) { diff --git a/mandoline/ui/phone_ui/phone_browser_application_delegate.cc b/mandoline/ui/phone_ui/phone_browser_application_delegate.cc index 367d82b..b17e76a 100644 --- a/mandoline/ui/phone_ui/phone_browser_application_delegate.cc +++ b/mandoline/ui/phone_ui/phone_browser_application_delegate.cc @@ -47,7 +47,7 @@ void PhoneBrowserApplicationDelegate::Initialize(mojo::ApplicationImpl* app) { break; } } - mus::CreateSingleWindowTreeHost(app_, this, &host_); + mus::CreateSingleWindowTreeHost(app_, this, &host_, nullptr); } bool PhoneBrowserApplicationDelegate::ConfigureIncomingConnection( |