Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(745)

Unified Diff: mandoline/ui/desktop_ui/browser_window.cc

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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « mandoline/ui/desktop_ui/browser_window.h ('k') | mandoline/ui/desktop_ui/public/interfaces/omnibox.mojom » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mandoline/ui/desktop_ui/browser_window.cc
diff --git a/mandoline/ui/desktop_ui/browser_window.cc b/mandoline/ui/desktop_ui/browser_window.cc
index 363320e7e5e897616124c91f2839072fefdb28f2..3fe21a7d30efa7be0add8b6230d8f576cf207e9f 100644
--- a/mandoline/ui/desktop_ui/browser_window.cc
+++ b/mandoline/ui/desktop_ui/browser_window.cc
@@ -68,7 +68,7 @@ class ProgressView : public views::View {
// BrowserWindow, public:
BrowserWindow::BrowserWindow(mojo::ApplicationImpl* app,
- mojo::ViewTreeHostFactory* host_factory,
+ mus::mojom::WindowTreeHostFactory* host_factory,
BrowserManager* manager)
: app_(app),
host_client_binding_(this),
@@ -82,7 +82,7 @@ BrowserWindow::BrowserWindow(mojo::ApplicationImpl* app,
find_active_(0),
find_count_(0),
web_view_(this) {
- mojo::ViewTreeHostClientPtr host_client;
+ mus::mojom::WindowTreeHostClientPtr host_client;
host_client_binding_.Bind(GetProxy(&host_client));
mus::CreateWindowTreeHost(host_factory, host_client.Pass(), this, &host_);
}
@@ -403,8 +403,8 @@ void BrowserWindow::Init(mus::Window* root) {
}
void BrowserWindow::EmbedOmnibox() {
- mojo::ViewTreeClientPtr view_tree_client;
- omnibox_->GetViewTreeClient(GetProxy(&view_tree_client));
+ mus::mojom::WindowTreeClientPtr view_tree_client;
+ omnibox_->GetWindowTreeClient(GetProxy(&view_tree_client));
omnibox_view_->Embed(view_tree_client.Pass());
// TODO(beng): This should be handled sufficiently by
« no previous file with comments | « mandoline/ui/desktop_ui/browser_window.h ('k') | mandoline/ui/desktop_ui/public/interfaces/omnibox.mojom » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698