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

Unified Diff: mash/quick_launch/quick_launch.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 | « mash/quick_launch/quick_launch.h ('k') | mash/task_viewer/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: mash/quick_launch/quick_launch.cc
diff --git a/mash/quick_launch/quick_launch.cc b/mash/quick_launch/quick_launch.cc
index ede1cbadf7016c79537284e3294cd636739c40ed..1eb5a16ca332d082c08043c1e924fc2e9b9f18a0 100644
--- a/mash/quick_launch/quick_launch.cc
+++ b/mash/quick_launch/quick_launch.cc
@@ -24,14 +24,10 @@
#include "ui/views/controls/textfield/textfield.h"
#include "ui/views/controls/textfield/textfield_controller.h"
#include "ui/views/mus/aura_init.h"
-#include "ui/views/mus/window_manager_connection.h"
+#include "ui/views/widget/widget.h"
#include "ui/views/widget/widget_delegate.h"
#include "url/gurl.h"
-namespace views {
-class AuraInit;
-}
-
namespace mash {
namespace quick_launch {
@@ -174,9 +170,8 @@ void QuickLaunch::OnStart() {
tracing_.Initialize(context()->connector(), context()->identity().name());
aura_init_ = base::MakeUnique<views::AuraInit>(
- context()->connector(), context()->identity(), "views_mus_resources.pak");
- window_manager_connection_ = views::WindowManagerConnection::Create(
- context()->connector(), context()->identity());
+ context()->connector(), context()->identity(), "views_mus_resources.pak",
+ std::string(), nullptr, views::AuraInit::Mode::AURA_MUS);
Launch(mojom::kWindow, mojom::LaunchMode::MAKE_NEW);
}
« no previous file with comments | « mash/quick_launch/quick_launch.h ('k') | mash/task_viewer/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698