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: ui/views/mus/screen_mus.cc

Issue 1674903003: Extract shell methods from ApplicationImpl into a base class, and pass this to Initialize() instead. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojom
Patch Set: . Created 4 years, 10 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 | « ui/views/mus/screen_mus.h ('k') | ui/views/mus/surface_binding.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/mus/screen_mus.cc
diff --git a/ui/views/mus/screen_mus.cc b/ui/views/mus/screen_mus.cc
index b918faac28c3bcd29d9c4cb9a9766969c36c9230..261f8f09e483260d226799b38ee90be7ea495a24 100644
--- a/ui/views/mus/screen_mus.cc
+++ b/ui/views/mus/screen_mus.cc
@@ -7,7 +7,7 @@
// #include "components/mus/public/interfaces/window_manager_constants.mojom.h"
#include "mojo/converters/geometry/geometry_type_converters.h"
#include "mojo/shell/public/cpp/application_connection.h"
-#include "mojo/shell/public/cpp/application_impl.h"
+#include "mojo/shell/public/cpp/shell.h"
#include "ui/gfx/display_finder.h"
#include "ui/gfx/display_observer.h"
#include "ui/views/mus/screen_mus_delegate.h"
@@ -75,10 +75,10 @@ ScreenMus::ScreenMus(ScreenMusDelegate* delegate)
ScreenMus::~ScreenMus() {}
-void ScreenMus::Init(mojo::ApplicationImpl* app) {
+void ScreenMus::Init(mojo::Shell* shell) {
gfx::Screen::SetScreenInstance(this);
- app->ConnectToService("mojo:mus", &display_manager_);
+ shell->ConnectToService("mojo:mus", &display_manager_);
display_manager_->AddObserver(
display_manager_observer_binding_.CreateInterfacePtrAndBind());
« no previous file with comments | « ui/views/mus/screen_mus.h ('k') | ui/views/mus/surface_binding.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698