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

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 2721153004: Remove ash_util namespace (Closed)
Patch Set: Created 3 years, 10 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/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 75a7370ce89a3cbc2d24caaac352265b346eed14..30b49feb921cd28b3a22f08a79fd347b7ac46067 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -214,8 +214,8 @@ class DBusServices {
explicit DBusServices(const content::MainFunctionParams& parameters) {
// Under mash, some D-Bus clients are owned by other processes.
DBusThreadManager::ProcessMask process_mask =
- ash_util::IsRunningInMash() ? DBusThreadManager::PROCESS_BROWSER
- : DBusThreadManager::PROCESS_ALL;
+ IsRunningInMash() ? DBusThreadManager::PROCESS_BROWSER
+ : DBusThreadManager::PROCESS_ALL;
// Initialize DBusThreadManager for the browser. This must be done after
// the main message loop is started, as it uses the message loop.
@@ -232,14 +232,14 @@ class DBusServices {
service_providers.push_back(
base::WrapUnique(ProxyResolutionServiceProvider::Create(
base::MakeUnique<ChromeProxyResolverDelegate>())));
- if (!ash_util::IsRunningInMash()) {
+ if (!IsRunningInMash()) {
// TODO(crbug.com/629707): revisit this with mustash dbus work.
service_providers.push_back(base::MakeUnique<DisplayPowerServiceProvider>(
base::MakeUnique<ChromeDisplayPowerServiceProviderDelegate>()));
}
service_providers.push_back(base::MakeUnique<LivenessServiceProvider>());
service_providers.push_back(base::MakeUnique<ScreenLockServiceProvider>());
- if (ash_util::IsRunningInMash()) {
+ if (IsRunningInMash()) {
service_providers.push_back(base::MakeUnique<ConsoleServiceProvider>(
base::MakeUnique<MusConsoleServiceProviderDelegate>()));
} else {
@@ -520,7 +520,7 @@ void ChromeBrowserMainPartsChromeos::PreProfileInit() {
AccessibilityManager::Initialize();
- if (!ash_util::IsRunningInMash()) {
+ if (!IsRunningInMash()) {
// Initialize magnification manager before ash tray is created. And this
// must be placed after UserManager::SessionStarted();
// TODO(sad): These components expects the ash::Shell instance to be
@@ -763,7 +763,7 @@ void ChromeBrowserMainPartsChromeos::PreBrowserStart() {
SystemKeyEventListener::Initialize();
}
- if (!ash_util::IsRunningInMash()) {
+ if (!IsRunningInMash()) {
// Listen for XI_HierarchyChanged events. Note: if this is moved to
// PreMainMessageLoopRun() then desktopui_PageCyclerTests fail for unknown
// reasons, see http://crosbug.com/24833.
@@ -787,7 +787,7 @@ void ChromeBrowserMainPartsChromeos::PreBrowserStart() {
}
void ChromeBrowserMainPartsChromeos::PostBrowserStart() {
- if (!ash_util::IsRunningInMash()) {
+ if (!IsRunningInMash()) {
system::InputDeviceSettings::Get()->UpdateTouchDevicesStatusFromPrefs();
// These are dependent on the ash::Shell singleton already having been
@@ -867,7 +867,7 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
keyboard_event_rewriters_.reset();
low_disk_notification_.reset();
#if defined(USE_X11)
- if (!ash_util::IsRunningInMash()) {
+ if (!IsRunningInMash()) {
// The XInput2 event listener needs to be shut down earlier than when
// Singletons are finally destroyed in AtExitManager.
XInputHierarchyChangedEventListener::GetInstance()->Stop();
@@ -884,7 +884,7 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
login_lock_state_notifier_.reset();
idle_action_warning_observer_.reset();
- if (!ash_util::IsRunningInMash())
+ if (!IsRunningInMash())
MagnificationManager::Shutdown();
media::SoundsManager::Shutdown();
@@ -926,7 +926,7 @@ void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
// closed above.
arc_kiosk_app_manager_.reset();
- if (!ash_util::IsRunningInMash())
+ if (!IsRunningInMash())
AccessibilityManager::Shutdown();
input_method::Shutdown();

Powered by Google App Engine
This is Rietveld 408576698