diff options
| author | ben <ben@chromium.org> | 2016-03-17 21:54:27 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-03-18 04:56:07 +0000 |
| commit | c740d5b9a7455a94ddce3835561aa2eb22942b7b (patch) | |
| tree | 69f6e7283c5dcb3ffa2ba9b214289bbc84c475c1 /ash | |
| parent | cbe6dc8d336bcf5e8a9b0e7da7d5b0939bda32e6 (diff) | |
| download | chromium_src-c740d5b9a7455a94ddce3835561aa2eb22942b7b.zip chromium_src-c740d5b9a7455a94ddce3835561aa2eb22942b7b.tar.gz chromium_src-c740d5b9a7455a94ddce3835561aa2eb22942b7b.tar.bz2 | |
Rename mash_shell to mash_session.
TBR=sky@chromium.org
BUG=
Review URL: https://codereview.chromium.org/1817443002
Cr-Commit-Position: refs/heads/master@{#381889}
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/shelf/shelf_layout_manager.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ash/shelf/shelf_layout_manager.cc b/ash/shelf/shelf_layout_manager.cc index 8b779fd..f27899c 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( |