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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 1839223003: Add basic Chrome interaction with the mash shelf. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Use associated interfaces for observers and item delegates. 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
« ash/mus/shelf_delegate_mus.cc ('K') | « chrome/browser/ui/ash/ash_util.h ('k') | chrome/browser/ui/ash/chrome_launcher_prefs.h » ('j') | mojo/public/cpp/bindings/associated_interface_ptr_set.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/ash_util.cc
diff --git a/chrome/browser/ui/ash/ash_util.cc b/chrome/browser/ui/ash/ash_util.cc
index d069db8dab60d7383ff808de2bdb3aed9a5c2732..6f3f395a6044e32cc9c8c8b82156e31de290620f 100644
--- a/chrome/browser/ui/ash/ash_util.cc
+++ b/chrome/browser/ui/ash/ash_util.cc
@@ -17,11 +17,17 @@
namespace chrome {
bool ShouldOpenAshOnStartup() {
+#if defined(OS_CHROMEOS)
+ return !IsRunningInMash();
+#else
+ return false;
+#endif
+}
+
+bool IsRunningInMash() {
#if defined(OS_CHROMEOS) && defined(MOJO_SHELL_CLIENT)
- return !content::MojoShellConnection::Get() ||
- !content::MojoShellConnection::Get()->UsingExternalShell();
-#elif defined(OS_CHROMEOS)
- return true;
+ return content::MojoShellConnection::Get() &&
+ content::MojoShellConnection::Get()->UsingExternalShell();
#else
return false;
#endif
« ash/mus/shelf_delegate_mus.cc ('K') | « chrome/browser/ui/ash/ash_util.h ('k') | chrome/browser/ui/ash/chrome_launcher_prefs.h » ('j') | mojo/public/cpp/bindings/associated_interface_ptr_set.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698