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

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

Issue 2777223002: Gets chrome --mus some what working (Closed)
Patch Set: fix mac Created 3 years, 9 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.cc ('k') | chrome/browser/ui/ash/ash_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/ash_util.h
diff --git a/chrome/browser/ui/ash/ash_util.h b/chrome/browser/ui/ash/ash_util.h
index d7a98a4a112e26c680cb1a6f8be50a308cc9f81a..ae0432746af02f96ce919c5456e00adcbf2b2d23 100644
--- a/chrome/browser/ui/ash/ash_util.h
+++ b/chrome/browser/ui/ash/ash_util.h
@@ -7,6 +7,7 @@
#include <memory>
+#include "ash/public/cpp/config.h"
#include "base/memory/ref_counted.h"
#include "base/single_thread_task_runner.h"
@@ -21,18 +22,6 @@ class KeyEvent;
namespace ash_util {
-enum class Config {
- // Classic mode does not use mus.
- CLASSIC,
-
- // Aura is backed by mus, but chrome and ash are still in the same process.
- MUS,
-
- // Aura is backed by mus and chrome and ash are in separate processes. In this
- // mode chrome code can only use ash code in ash/public/cpp.
- MASH,
-};
-
// Creates an in-process Service instance of which can host common ash
// interfaces.
std::unique_ptr<service_manager::Service> CreateEmbeddedAshService(
@@ -42,11 +31,9 @@ std::unique_ptr<service_manager::Service> CreateEmbeddedAshService(
bool ShouldOpenAshOnStartup();
// Returns true if Chrome is running in the mash shell.
-// TODO(sky): convert to GetConfig().
+// TODO(sky): convert to chromeos::GetConfig() and remove.
bool IsRunningInMash();
-Config GetConfig();
-
// Returns true if the given |accelerator| has been deprecated and hence can
// be consumed by web contents if needed.
bool IsAcceleratorDeprecated(const ui::Accelerator& accelerator);
« no previous file with comments | « chrome/browser/ui/ash/ash_init.cc ('k') | chrome/browser/ui/ash/ash_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698