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

Side by Side Diff: chrome/browser/ui/ash/ash_util.h

Issue 2775873002: Adds the ability to run chromeos with mus (Closed)
Patch Set: merge 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_ASH_ASH_UTIL_H_ 5 #ifndef CHROME_BROWSER_UI_ASH_ASH_UTIL_H_
6 #define CHROME_BROWSER_UI_ASH_ASH_UTIL_H_ 6 #define CHROME_BROWSER_UI_ASH_ASH_UTIL_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
11 #include "base/single_thread_task_runner.h" 11 #include "base/single_thread_task_runner.h"
12 12
13 namespace service_manager { 13 namespace service_manager {
14 class Service; 14 class Service;
15 } 15 }
16 16
17 namespace ui { 17 namespace ui {
18 class Accelerator; 18 class Accelerator;
19 class KeyEvent; 19 class KeyEvent;
20 } // namespace ui 20 } // namespace ui
21 21
22 namespace ash_util { 22 namespace ash_util {
23 23
24 enum class Config {
25 // Classic mode does not use mus.
26 CLASSIC,
27
28 // Aura is backed by mus, but chrome and ash are still in the same process.
29 MUS,
30
31 // Aura is backed by mus and chrome and ash are in separate processes. In this
32 // mode chrome code can only use ash code in ash/public/cpp.
33 MASH,
34 };
35
24 // Creates an in-process Service instance of which can host common ash 36 // Creates an in-process Service instance of which can host common ash
25 // interfaces. 37 // interfaces.
26 std::unique_ptr<service_manager::Service> CreateEmbeddedAshService( 38 std::unique_ptr<service_manager::Service> CreateEmbeddedAshService(
27 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner); 39 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
28 40
29 // Returns true if Ash should be run at startup. 41 // Returns true if Ash should be run at startup.
30 bool ShouldOpenAshOnStartup(); 42 bool ShouldOpenAshOnStartup();
31 43
32 // Returns true if Chrome is running in the mash shell. 44 // Returns true if Chrome is running in the mash shell.
45 // TODO(sky): convert to GetConfig().
33 bool IsRunningInMash(); 46 bool IsRunningInMash();
34 47
48 Config GetConfig();
49
35 // Returns true if the given |accelerator| has been deprecated and hence can 50 // Returns true if the given |accelerator| has been deprecated and hence can
36 // be consumed by web contents if needed. 51 // be consumed by web contents if needed.
37 bool IsAcceleratorDeprecated(const ui::Accelerator& accelerator); 52 bool IsAcceleratorDeprecated(const ui::Accelerator& accelerator);
38 53
39 // Returns true if ash has an accelerator for |key_event| that is enabled. 54 // Returns true if ash has an accelerator for |key_event| that is enabled.
40 bool WillAshProcessAcceleratorForEvent(const ui::KeyEvent& key_event); 55 bool WillAshProcessAcceleratorForEvent(const ui::KeyEvent& key_event);
41 56
42 } // namespace ash_util 57 } // namespace ash_util
43 58
44 #endif // CHROME_BROWSER_UI_ASH_ASH_UTIL_H_ 59 #endif // CHROME_BROWSER_UI_ASH_ASH_UTIL_H_
OLDNEW
« no previous file with comments | « chrome/browser/chrome_content_browser_manifest_overlay.json ('k') | chrome/browser/ui/ash/ash_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698