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

Unified Diff: ash/mus/sysui_application.cc

Issue 1725353003: Eliminate mojo::Shell client lib class (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@15connector
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
Index: ash/mus/sysui_application.cc
diff --git a/ash/mus/sysui_application.cc b/ash/mus/sysui_application.cc
index 739242dc7b0ff48c01dbf7b10688f0e98b759e19..1b230608008c93ee9cb77cca655be2216af9e79d 100644
--- a/ash/mus/sysui_application.cc
+++ b/ash/mus/sysui_application.cc
@@ -152,9 +152,9 @@ class AshInit {
aura::Window* root() { return ash::Shell::GetPrimaryRootWindow(); }
- void Initialize(mojo::Shell* shell) {
- aura_init_.reset(new views::AuraInit(shell, "views_mus_resources.pak"));
- views::WindowManagerConnection::Create(shell);
+ void Initialize(mojo::Connector* connector) {
+ aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
+ views::WindowManagerConnection::Create(connector);
gfx::Screen* screen = gfx::Screen::GetScreen();
DCHECK(screen);
@@ -179,7 +179,8 @@ class AshInit {
init_params.context_factory = new StubContextFactory;
init_params.blocking_pool = worker_pool_.get();
init_params.in_mus = true;
- init_params.keyboard_factory = base::Bind(&KeyboardUIMus::Create, shell);
+ init_params.keyboard_factory =
+ base::Bind(&KeyboardUIMus::Create, connector);
ash::Shell::CreateInstance(init_params);
ash::Shell::GetInstance()->CreateShelf();
ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(
@@ -254,12 +255,12 @@ SysUIApplication::SysUIApplication() {}
SysUIApplication::~SysUIApplication() {}
-void SysUIApplication::Initialize(mojo::Shell* shell,
+void SysUIApplication::Initialize(mojo::Connector* connector,
const std::string& url,
uint32_t id,
uint32_t user_id) {
ash_init_.reset(new AshInit());
- ash_init_->Initialize(shell);
+ ash_init_->Initialize(connector);
}
bool SysUIApplication::AcceptConnection(mojo::Connection* connection) {

Powered by Google App Engine
This is Rietveld 408576698