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

Unified Diff: services/navigation/public/cpp/view.cc

Issue 2576533003: Converts some services to use aura-mus (Closed)
Patch Set: remove log Created 4 years 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 | « services/navigation/public/cpp/view.h ('k') | ui/aura/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: services/navigation/public/cpp/view.cc
diff --git a/services/navigation/public/cpp/view.cc b/services/navigation/public/cpp/view.cc
index 23158cea2340de5592e8f5b332f23476b4ea5a4f..fc4055e9f3c94c3b2a11a91aa48da8757b77bf80 100644
--- a/services/navigation/public/cpp/view.cc
+++ b/services/navigation/public/cpp/view.cc
@@ -4,12 +4,20 @@
#include "services/navigation/public/cpp/view.h"
+#include "base/bind.h"
#include "base/strings/utf_string_conversions.h"
#include "services/navigation/public/cpp/view_delegate.h"
#include "services/navigation/public/cpp/view_observer.h"
-#include "services/ui/public/cpp/window.h"
+#include "ui/aura/mus/window_port_mus.h"
+#include "ui/aura/window.h"
namespace navigation {
+namespace {
+
+// Callback with result of Embed().
+void EmbedCallback(bool result) {}
+
+} // namespace
////////////////////////////////////////////////////////////////////////////////
// View, public:
@@ -85,10 +93,12 @@ void View::HideInterstitial() {
view_->HideInterstitial();
}
-void View::EmbedInWindow(ui::Window* parent) {
+void View::EmbedInWindow(aura::Window* parent) {
ui::mojom::WindowTreeClientPtr client;
view_->GetWindowTreeClient(GetProxy(&client));
- parent->Embed(std::move(client));
+ const uint32_t embed_flags = 0u; // Nothing special.
+ aura::WindowPortMus::Get(parent)->Embed(std::move(client), embed_flags,
+ base::Bind(&EmbedCallback));
}
////////////////////////////////////////////////////////////////////////////////
« no previous file with comments | « services/navigation/public/cpp/view.h ('k') | ui/aura/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698