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

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

Issue 2718043002: Replace more hardcoded "ash" strings with ash::mojom::kServiceName (Closed)
Patch Set: Remove ash_util includes that are no longer needed. 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 } // namespace ui 19 } // namespace ui
20 20
21 namespace ash_util { 21 namespace ash_util {
22 22
23 // Returns the name of the ash service depending on whether the browser is
24 // running in classic ash or mash.
25 const char* GetAshServiceName();
26
27 // Creates an in-process Service instance of which can host common ash 23 // Creates an in-process Service instance of which can host common ash
28 // interfaces. 24 // interfaces.
29 std::unique_ptr<service_manager::Service> CreateEmbeddedAshService( 25 std::unique_ptr<service_manager::Service> CreateEmbeddedAshService(
30 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner); 26 const scoped_refptr<base::SingleThreadTaskRunner>& task_runner);
31 27
32 } // namespace ash_util 28 } // namespace ash_util
33 29
34 // TODO(jamescook): Change this namespace to ash_util. 30 // TODO(jamescook): Change this namespace to ash_util.
35 namespace chrome { 31 namespace chrome {
36 32
37 // Returns true if Ash should be run at startup. 33 // Returns true if Ash should be run at startup.
38 bool ShouldOpenAshOnStartup(); 34 bool ShouldOpenAshOnStartup();
39 35
40 // Returns true if Chrome is running in the mash shell. 36 // Returns true if Chrome is running in the mash shell.
41 bool IsRunningInMash(); 37 bool IsRunningInMash();
42 38
43 // Returns true if the given |accelerator| has been deprecated and hence can 39 // Returns true if the given |accelerator| has been deprecated and hence can
44 // be consumed by web contents if needed. 40 // be consumed by web contents if needed.
45 bool IsAcceleratorDeprecated(const ui::Accelerator& accelerator); 41 bool IsAcceleratorDeprecated(const ui::Accelerator& accelerator);
46 42
47 } // namespace chrome 43 } // namespace chrome
48 44
49 #endif // CHROME_BROWSER_UI_ASH_ASH_UTIL_H_ 45 #endif // CHROME_BROWSER_UI_ASH_ASH_UTIL_H_
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/app_list/app_list_presenter_service.cc ('k') | chrome/browser/ui/ash/ash_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698