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

Unified Diff: chrome/browser/ui/ash/ash_init.cc

Issue 2381753002: Use mojo SystemTray interfaces for both mash and classic ash (Closed)
Patch Set: Restructure based on feedback Created 4 years, 3 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: chrome/browser/ui/ash/ash_init.cc
diff --git a/chrome/browser/ui/ash/ash_init.cc b/chrome/browser/ui/ash/ash_init.cc
index 6e7ebd3923de3569a1c1d80fb7127d7fdd9bb1ba..b825949934076da0955615da6e71138d270862db 100644
--- a/chrome/browser/ui/ash/ash_init.cc
+++ b/chrome/browser/ui/ash/ash_init.cc
@@ -34,6 +34,7 @@
#include "chromeos/login/login_state.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/context_factory.h"
+#include "content/public/common/mojo_shell_connection.h"
#include "ui/aura/env.h"
#include "ui/aura/window_tree_host.h"
@@ -65,6 +66,9 @@ void OpenAsh(gfx::AcceleratedWidget remote_window) {
shell_init_params.delegate = new ChromeShellDelegate;
shell_init_params.context_factory = content::GetContextFactory();
shell_init_params.blocking_pool = content::BrowserThread::GetBlockingPool();
+ shell_init_params.connector =
+ content::MojoShellConnection::GetForProcess()->GetConnector();
+ DCHECK(shell_init_params.connector);
ash::Shell* shell = ash::Shell::CreateInstance(shell_init_params);
shell->accelerator_controller_delegate()->SetScreenshotDelegate(

Powered by Google App Engine
This is Rietveld 408576698