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

Unified Diff: mash/example/views_examples/views_examples.cc

Issue 2569413003: Converts more services to use aura-mus (Closed)
Patch Set: merge 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/example/views_examples/BUILD.gn ('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/example/views_examples/views_examples.cc
diff --git a/mash/example/views_examples/views_examples.cc b/mash/example/views_examples/views_examples.cc
index 43b82f262030161d2a3acdc83acc822b1cd10c92..d266ec2e8f7bbc609fc63854b8f724f70b930b62 100644
--- a/mash/example/views_examples/views_examples.cc
+++ b/mash/example/views_examples/views_examples.cc
@@ -20,12 +20,6 @@
#include "ui/views/examples/example_base.h"
#include "ui/views/examples/examples_window.h"
#include "ui/views/mus/aura_init.h"
-#include "ui/views/mus/window_manager_connection.h"
-
-namespace views {
-class AuraInit;
-class WindowManagerConnection;
-}
class ViewsExamples
: public service_manager::Service,
@@ -41,9 +35,8 @@ class ViewsExamples
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());
+ "views_mus_resources.pak", std::string(), nullptr,
+ views::AuraInit::Mode::AURA_MUS);
}
bool OnConnect(const service_manager::ServiceInfo& remote_info,
service_manager::InterfaceRegistry* registry) override {
@@ -67,7 +60,6 @@ class ViewsExamples
tracing::Provider tracing_;
std::unique_ptr<views::AuraInit> aura_init_;
- std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
DISALLOW_COPY_AND_ASSIGN(ViewsExamples);
};
« no previous file with comments | « mash/example/views_examples/BUILD.gn ('k') | mash/task_viewer/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698