Rename mash_shell to mash_session.

ash/shelf/shelf_layout_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/shelf/shelf_layout_manager.h"
 
 #include <algorithm>
 #include <cmath>
 #include <cstring>
 #include <string>
@@ skipping 642 matching lines @@
           ui::LayerAnimator::IMMEDIATELY_ANIMATE_TO_NEW_TARGET);
     } else {
       StopAnimating();
       shelf_animation_setter.SetTransitionDuration(base::TimeDelta());
       status_animation_setter.SetTransitionDuration(base::TimeDelta());
     }
     if (observer)
       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(),
           target_bounds.shelf_bounds_in_root));
     }
 
     GetLayer(shelf_->status_area_widget())->SetOpacity(
         target_bounds.status_opacity);
 
     // Having a window which is visible but does not have an opacity is an
     // illegal state. We therefore hide the shelf here if required.
     if (!target_bounds.status_opacity)
       shelf_->status_area_widget()->Hide();
     // Setting visibility during an animation causes the visibility property to
     // animate. Override the animation settings to immediately set the
     // visibility property. Opacity will still animate.
 
     // TODO(harrym): Once status area widget is a child view of shelf
     // 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(
               shelf_->status_area_widget()->GetNativeView()->parent(),
               status_bounds));
     }
     if (!state_.is_screen_locked) {
       gfx::Insets insets;
       // If user session is blocked (login to new user session or add user to
       // the existing session - multi-profile) then give 100% of work area only
@@ skipping 464 matching lines @@
     return false;
   }
   if (session_state_delegate->IsUserSessionBlocked() ||
       state_.is_adding_user_screen) {
     return true;
   }
   return false;
 }
 
 }  // namespace ash