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

Unified Diff: chrome/browser/chromeos/first_run/steps/tray_step.cc

Issue 2036353002: mash: Move ash/common/wm/shelf to ash/common/shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase again Created 4 years, 6 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 | « ash/wm/workspace_controller_unittest.cc ('k') | chrome/browser/ui/apps/chrome_app_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/first_run/steps/tray_step.cc
diff --git a/chrome/browser/chromeos/first_run/steps/tray_step.cc b/chrome/browser/chromeos/first_run/steps/tray_step.cc
index a18df9cc702f03db162c1df67b70be3c612cc384..07ca41645a2b4801c2611ec8920d01137d878597 100644
--- a/chrome/browser/chromeos/first_run/steps/tray_step.cc
+++ b/chrome/browser/chromeos/first_run/steps/tray_step.cc
@@ -27,10 +27,9 @@ void TrayStep::DoShow() {
bounds.height());
FirstRunActor::StepPosition position;
position.SetTop(bounds.y());
- ash::wm::ShelfAlignment alignment =
- ash::Shelf::ForPrimaryDisplay()->alignment();
- if ((!base::i18n::IsRTL() && alignment != ash::wm::SHELF_ALIGNMENT_LEFT) ||
- alignment == ash::wm::SHELF_ALIGNMENT_RIGHT)
+ ash::ShelfAlignment alignment = ash::Shelf::ForPrimaryDisplay()->alignment();
+ if ((!base::i18n::IsRTL() && alignment != ash::SHELF_ALIGNMENT_LEFT) ||
+ alignment == ash::SHELF_ALIGNMENT_RIGHT)
position.SetRight(GetOverlaySize().width() - bounds.x());
else
position.SetLeft(bounds.right());
« no previous file with comments | « ash/wm/workspace_controller_unittest.cc ('k') | chrome/browser/ui/apps/chrome_app_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698