| Index: ash/shelf/shelf_layout_manager.cc
|
| diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc
|
| index 8b779fdac359535b74f058d4a4643bd7e77e63d8..f27899c85eab8aca4fbeb100e15d5f150ff5faf6 100644
|
| --- a/ash/shelf/shelf_layout_manager.cc
|
| +++ b/ash/shelf/shelf_layout_manager.cc
|
| @@ -660,7 +660,7 @@ void ShelfLayoutManager::UpdateBoundsAndOpacity(
|
| status_animation_setter.AddObserver(observer);
|
|
|
| GetLayer(shelf_)->SetOpacity(target_bounds.opacity);
|
| - // mash::wm::ShelfLayout manages window bounds when running mash_shell.
|
| + // mash::wm::ShelfLayout manages window bounds when running in mash.
|
| if (!aura::GetMusWindow(shelf_->GetNativeWindow())) {
|
| shelf_->SetBounds(ScreenUtil::ConvertRectToScreen(
|
| shelf_->GetNativeView()->parent(),
|
| @@ -682,7 +682,7 @@ void ShelfLayoutManager::UpdateBoundsAndOpacity(
|
| // this can be simplified.
|
| gfx::Rect status_bounds = target_bounds.status_bounds_in_shelf;
|
| status_bounds.Offset(target_bounds.shelf_bounds_in_root.OffsetFromOrigin());
|
| - // mash::wm::ShelfLayout manages window bounds when running mash_shell.
|
| + // mash::wm::ShelfLayout manages window bounds when running mash.
|
| if (!aura::GetMusWindow(shelf_->GetNativeWindow())) {
|
| shelf_->status_area_widget()->SetBounds(
|
| ScreenUtil::ConvertRectToScreen(
|
|
|