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

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

Issue 1839223003: Add basic Chrome interaction with the mash shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Sync and rebase. Created 4 years, 8 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 | « chrome/browser/ui/ash/ash_init.h ('k') | chrome/browser/ui/ash/ash_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 330eb25e35761b70f1be0a0132461a15297e0dea..8b4add83409f43aa40ea6fd9325a9f7676b814b1 100644
--- a/chrome/browser/ui/ash/ash_init.cc
+++ b/chrome/browser/ui/ash/ash_init.cc
@@ -38,6 +38,10 @@
#include "ui/base/x/x11_util.h"
#endif
+#if defined(MOJO_SHELL_CLIENT)
+#include "chrome/browser/ui/ash/launcher/chrome_mash_shelf_controller.h"
+#endif
+
namespace chrome {
void OpenAsh(gfx::AcceleratedWidget remote_window) {
@@ -101,6 +105,13 @@ void OpenAsh(gfx::AcceleratedWidget remote_window) {
ash::Shell::GetPrimaryRootWindow()->GetHost()->Show();
}
+void InitializeMash() {
+#if defined(MOJO_SHELL_CLIENT)
+ DCHECK(!ash::Shell::HasInstance());
+ ChromeMashShelfController::CreateInstance();
+#endif
+}
+
void CloseAsh() {
if (ash::Shell::HasInstance()) {
ash::Shell::DeleteInstance();
« no previous file with comments | « chrome/browser/ui/ash/ash_init.h ('k') | chrome/browser/ui/ash/ash_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698