mandoline/ui/phone_ui/phone_browser_application_delegate.h - Issue 1406153004: components/mus/public/interfaces View => Window

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: mandoline/ui/phone_ui/phone_browser_application_delegate.h

Issue 1406153004: components/mus/public/interfaces View => Window (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Yet another rebase Created 5 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: mandoline/ui/phone_ui/phone_browser_application_delegate.h

diff --git a/mandoline/ui/phone_ui/phone_browser_application_delegate.h b/mandoline/ui/phone_ui/phone_browser_application_delegate.h

index e21c225b4ee7848be64fee4d8536df019f22d72f..a66f4cf92d8ed5758f68c7d08e1bde28905f63a2 100644

--- a/mandoline/ui/phone_ui/phone_browser_application_delegate.h

+++ b/mandoline/ui/phone_ui/phone_browser_application_delegate.h

@@ -9,7 +9,7 @@

#include "base/memory/scoped_ptr.h"

#include "components/mus/public/cpp/window_observer.h"

#include "components/mus/public/cpp/window_tree_delegate.h"

-#include "components/mus/public/interfaces/view_tree_host.mojom.h"

+#include "components/mus/public/interfaces/window_tree_host.mojom.h"

#include "components/web_view/public/cpp/web_view.h"

#include "components/web_view/public/interfaces/web_view.mojom.h"

// TODO(beng): move this file somewhere common.

@@ -71,7 +71,7 @@ class PhoneBrowserApplicationDelegate

mojo::InterfaceRequest<LaunchHandler> request) override;

mojo::ApplicationImpl* app_;

- mojo::ViewTreeHostPtr host_;

+ mus::mojom::WindowTreeHostPtr host_;

mus::Window* root_;

mus::Window* content_;