Index: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc |
diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc |
index a94257d65a27056b8e790ea9ce84e7aa10c71a1f..b491ac47e35faa34160a9edf68ca55c674e3acb3 100644 |
--- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc |
+++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc |
@@ -38,7 +38,7 @@ ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() {} |
void ChromeBrowserMainExtraPartsAsh::ServiceManagerConnectionStarted( |
content::ServiceManagerConnection* connection) { |
- if (ash_util::IsRunningInMash()) { |
+ if (IsRunningInMash()) { |
// Register ash-specific window properties with Chrome's property converter. |
// This propagates ash properties set on chrome windows to ash, via mojo. |
DCHECK(views::MusClient::Exists()); |
@@ -61,10 +61,10 @@ void ChromeBrowserMainExtraPartsAsh::ServiceManagerConnectionStarted( |
} |
void ChromeBrowserMainExtraPartsAsh::PreProfileInit() { |
- if (ash_util::ShouldOpenAshOnStartup()) |
+ if (ShouldOpenAshOnStartup()) |
chrome::OpenAsh(gfx::kNullAcceleratedWidget); |
- if (ash_util::IsRunningInMash()) { |
+ if (IsRunningInMash()) { |
immersive_context_ = base::MakeUnique<ImmersiveContextMus>(); |
immersive_handler_factory_ = base::MakeUnique<ImmersiveHandlerFactoryMus>(); |
} |
@@ -86,7 +86,7 @@ void ChromeBrowserMainExtraPartsAsh::PreProfileInit() { |
} |
void ChromeBrowserMainExtraPartsAsh::PostProfileInit() { |
- if (ash_util::IsRunningInMash()) { |
+ if (IsRunningInMash()) { |
DCHECK(!ash::Shell::HasInstance()); |
DCHECK(!ChromeLauncherController::instance()); |
chrome_launcher_controller_mus_ = |