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

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

Issue 634313004: Display dialog when app install succeeds / fails on Athena (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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_util.cc
diff --git a/chrome/browser/ui/ash/ash_util.cc b/chrome/browser/ui/ash/ash_util.cc
index de8b919cffa99b1d67f288192468f1344f6973fb..10cb28c5e61adb52dc33abb18d16fe28aeae7e58 100644
--- a/chrome/browser/ui/ash/ash_util.cc
+++ b/chrome/browser/ui/ash/ash_util.cc
@@ -5,12 +5,22 @@
#include "chrome/browser/ui/ash/ash_util.h"
#include "ash/shell.h"
+#include "base/command_line.h"
#include "chrome/browser/ui/ash/ash_init.h"
#include "chrome/browser/ui/host_desktop.h"
+#include "chrome/common/chrome_switches.h"
#include "ui/aura/window_event_dispatcher.h"
namespace chrome {
+bool ShouldOpenAshOnStartup() {
+#if defined(OS_CHROMEOS)
+ return true;
+#endif
+ // TODO(scottmg): http://crbug.com/133312, will need this for Win8 too.
+ return CommandLine::ForCurrentProcess()->HasSwitch(switches::kOpenAsh);
+}
+
bool IsNativeViewInAsh(gfx::NativeView native_view) {
#if defined(OS_CHROMEOS)
// Optimization. There is only ash or only athena on ChromeOS.

Powered by Google App Engine
This is Rietveld 408576698