Index: chrome/browser/chromeos/login/ui/login_display_host_impl.cc |
diff --git a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc |
index 763dc932d73f517c8a6338dcfacc5e5b0cfab25d..5d103ea98afa7dc19c9f9e61767666b6ecb88f06 100644 |
--- a/chrome/browser/chromeos/login/ui/login_display_host_impl.cc |
+++ b/chrome/browser/chromeos/login/ui/login_display_host_impl.cc |
@@ -341,7 +341,7 @@ class LoginDisplayHostImpl::LoginWidgetDelegate : public views::WidgetDelegate { |
// * Ash crash at the login screen on mustash |
// In the latter case the mash root process will trigger a clean restart |
// of content_browser. |
- if (ash_util::IsRunningInMash() && login_display_host_) |
+ if (IsRunningInMash() && login_display_host_) |
login_display_host_->ResetLoginWindowAndView(); |
} |
void DeleteDelegate() override { delete this; } |
@@ -365,7 +365,7 @@ LoginDisplayHostImpl::LoginDisplayHostImpl(const gfx::Rect& wallpaper_bounds) |
: wallpaper_bounds_(wallpaper_bounds), |
pointer_factory_(this), |
animation_weak_ptr_factory_(this) { |
- if (ash_util::IsRunningInMash()) { |
+ if (IsRunningInMash()) { |
// Animation, and initializing hidden, are not currently supported for Mash. |
finalize_animation_type_ = ANIMATION_NONE; |
initialize_webui_hidden_ = false; |
@@ -378,7 +378,7 @@ LoginDisplayHostImpl::LoginDisplayHostImpl(const gfx::Rect& wallpaper_bounds) |
is_observing_keyboard_ = true; |
} |
- if (!ash_util::IsRunningInMash()) |
+ if (!IsRunningInMash()) |
ash::WmShell::Get()->AddShellObserver(this); |
else |
NOTIMPLEMENTED(); |
@@ -414,7 +414,7 @@ LoginDisplayHostImpl::LoginDisplayHostImpl(const gfx::Rect& wallpaper_bounds) |
bool is_registered = StartupUtils::IsDeviceRegistered(); |
bool zero_delay_enabled = WizardController::IsZeroDelayEnabled(); |
// Mash always runs login screen with zero delay |
- if (ash_util::IsRunningInMash()) |
+ if (IsRunningInMash()) |
zero_delay_enabled = true; |
bool disable_boot_animation = |
base::CommandLine::ForCurrentProcess()->HasSwitch( |
@@ -429,13 +429,13 @@ LoginDisplayHostImpl::LoginDisplayHostImpl(const gfx::Rect& wallpaper_bounds) |
waiting_for_user_pods_ = !zero_delay_enabled && !waiting_for_wallpaper_load_; |
// Initializing hidden is not supported in Mash |
- if (!ash_util::IsRunningInMash()) { |
+ if (!IsRunningInMash()) { |
initialize_webui_hidden_ = |
kHiddenWebUIInitializationDefault && !zero_delay_enabled; |
} |
// Check if WebUI init type is overriden. Not supported in Mash. |
- if (!ash_util::IsRunningInMash() && |
+ if (!IsRunningInMash() && |
base::CommandLine::ForCurrentProcess()->HasSwitch( |
switches::kAshWebUIInit)) { |
const std::string override_type = |
@@ -481,7 +481,7 @@ LoginDisplayHostImpl::LoginDisplayHostImpl(const gfx::Rect& wallpaper_bounds) |
bundle.GetRawDataResource(IDR_SOUND_STARTUP_WAV)); |
// Disable Drag'n'Drop for the login session. |
- if (!ash_util::IsRunningInMash()) { |
+ if (!IsRunningInMash()) { |
scoped_drag_drop_disabler_.reset(new aura::client::ScopedDragDropDisabler( |
ash::Shell::GetPrimaryRootWindow())); |
} else { |
@@ -497,7 +497,7 @@ LoginDisplayHostImpl::~LoginDisplayHostImpl() { |
is_observing_keyboard_ = false; |
} |
- if (!ash_util::IsRunningInMash()) |
+ if (!IsRunningInMash()) |
ash::WmShell::Get()->RemoveShellObserver(this); |
else |
NOTIMPLEMENTED(); |
@@ -662,7 +662,7 @@ void LoginDisplayHostImpl::StartUserAdding( |
restore_path_ = RESTORE_ADD_USER_INTO_SESSION; |
completion_callback_ = completion_callback; |
// Animation is not supported in Mash |
- if (!ash_util::IsRunningInMash()) |
+ if (!IsRunningInMash()) |
finalize_animation_type_ = ANIMATION_ADD_USER; |
// Observe the user switch animation and defer the deletion of itself only |
// after the animation is finished. |
@@ -678,7 +678,7 @@ void LoginDisplayHostImpl::StartUserAdding( |
// We should emit this signal only at login screen (after reboot or sign out). |
login_view_->set_should_emit_login_prompt_visible(false); |
- if (!ash_util::IsRunningInMash()) { |
+ if (!IsRunningInMash()) { |
// Lock container can be transparent after lock screen animation. |
aura::Window* lock_container = ash::Shell::GetContainer( |
ash::Shell::GetPrimaryRootWindow(), |
@@ -727,7 +727,7 @@ void LoginDisplayHostImpl::StartSignInScreen( |
restore_path_ = RESTORE_SIGN_IN; |
is_showing_login_ = true; |
// Animation is not supported in Mash |
- if (!ash_util::IsRunningInMash()) |
+ if (!IsRunningInMash()) |
finalize_animation_type_ = ANIMATION_WORKSPACE; |
PrewarmAuthentication(); |
@@ -854,7 +854,7 @@ void LoginDisplayHostImpl::StartAppLaunch(const std::string& app_id, |
} |
// Animation is not supported in Mash. |
- if (!ash_util::IsRunningInMash()) |
+ if (!IsRunningInMash()) |
finalize_animation_type_ = ANIMATION_FADE_OUT; |
if (!login_window_) |
LoadURL(GURL(kAppLaunchSplashURL)); |
@@ -872,7 +872,7 @@ void LoginDisplayHostImpl::StartArcKiosk(const AccountId& account_id) { |
SetStatusAreaVisible(false); |
// Animation is not supported in Mash. |
- if (!ash_util::IsRunningInMash()) |
+ if (!IsRunningInMash()) |
finalize_animation_type_ = ANIMATION_FADE_OUT; |
if (!login_window_) { |
LoadURL(GURL(kAppLaunchSplashURL)); |
@@ -945,7 +945,7 @@ void LoginDisplayHostImpl::Observe( |
content::NotificationService::AllSources()); |
} else if (type == chrome::NOTIFICATION_LOGIN_USER_CHANGED && |
user_manager::UserManager::Get()->IsCurrentUserNew()) { |
- if (!ash_util::IsRunningInMash()) { |
+ if (!IsRunningInMash()) { |
// For new user, move wallpaper to lock container so that windows created |
// during the user image picker step are below it. |
ash::WmShell::Get()->wallpaper_controller()->MoveToLockedContainer(); |
@@ -958,7 +958,7 @@ void LoginDisplayHostImpl::Observe( |
} else if (chrome::NOTIFICATION_WALLPAPER_ANIMATION_FINISHED == type) { |
VLOG(1) << "Login WebUI >> wp animation done"; |
is_wallpaper_loaded_ = true; |
- if (!ash_util::IsRunningInMash()) { |
+ if (!IsRunningInMash()) { |
ash::WmShell::Get() |
->wallpaper_delegate() |
->OnWallpaperBootAnimationFinished(); |
@@ -1117,7 +1117,7 @@ void LoginDisplayHostImpl::ShutdownDisplayHost(bool post_quit_task) { |
if (ash::Shell::HasInstance() && |
finalize_animation_type_ == ANIMATION_ADD_USER) { |
- if (!ash_util::IsRunningInMash()) { |
+ if (!IsRunningInMash()) { |
ash::WmShell::Get()->wallpaper_controller()->MoveToUnlockedContainer(); |
} else { |
NOTIMPLEMENTED(); |
@@ -1126,7 +1126,7 @@ void LoginDisplayHostImpl::ShutdownDisplayHost(bool post_quit_task) { |
} |
void LoginDisplayHostImpl::ScheduleWorkspaceAnimation() { |
- if (ash_util::IsRunningInMash()) { |
+ if (IsRunningInMash()) { |
NOTIMPLEMENTED(); |
return; |
} |
@@ -1236,7 +1236,7 @@ void LoginDisplayHostImpl::InitLoginWindowAndView() { |
params.show_state = ui::SHOW_STATE_FULLSCREEN; |
params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW; |
// The ash::Shell containers are not available in Mash |
- if (!ash_util::IsRunningInMash()) { |
+ if (!IsRunningInMash()) { |
params.parent = |
ash::Shell::GetContainer(ash::Shell::GetPrimaryRootWindow(), |
ash::kShellWindowId_LockScreenContainer); |
@@ -1257,7 +1257,7 @@ void LoginDisplayHostImpl::InitLoginWindowAndView() { |
OnLoginPromptVisible(); |
// Animations are not available in Mash |
- if (!ash_util::IsRunningInMash()) { |
+ if (!IsRunningInMash()) { |
login_window_->SetVisibilityAnimationDuration( |
base::TimeDelta::FromMilliseconds(kLoginFadeoutTransitionDurationMs)); |
login_window_->SetVisibilityAnimationTransition( |