Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2757)

Unified Diff: ash/shelf/shelf_layout_manager.cc

Issue 1817443002: Rename mash_shell to mash_session. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/app/mash/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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(
« no previous file with comments | « no previous file | chrome/app/mash/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698