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

Unified Diff: ash/app_list/app_list_shower_delegate.cc

Issue 1913553002: Fix compile failures from shelf locking merge CL. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2704
Patch Set: Update GetAlignment function call. Created 4 years, 8 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 | ash/wm/app_list_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/app_list/app_list_shower_delegate.cc
diff --git a/ash/app_list/app_list_shower_delegate.cc b/ash/app_list/app_list_shower_delegate.cc
index f79d9f91d485f3267049ba430bd82c5e6940e62c..3d0d2c74da33268fa910bb4dca6c1949e7280d24 100644
--- a/ash/app_list/app_list_shower_delegate.cc
+++ b/ash/app_list/app_list_shower_delegate.cc
@@ -56,6 +56,7 @@ gfx::Vector2d GetAnchorPositionOffsetToShelf(
gfx::Point anchor(button_bounds.CenterPoint());
switch (shelf_alignment) {
case SHELF_ALIGNMENT_BOTTOM:
+ case SHELF_ALIGNMENT_BOTTOM_LOCKED:
if (base::i18n::IsRTL()) {
int screen_width = widget->GetWorkAreaBoundsInScreen().width();
return gfx::Vector2d(
@@ -261,6 +262,7 @@ gfx::Vector2d AppListShowerDelegate::GetVisibilityAnimationOffset(
Shell::GetInstance()->GetShelfAlignment(root_window);
switch (shelf_alignment) {
case SHELF_ALIGNMENT_BOTTOM:
+ case SHELF_ALIGNMENT_BOTTOM_LOCKED:
return gfx::Vector2d(0, kAnimationOffset);
case SHELF_ALIGNMENT_LEFT:
return gfx::Vector2d(-kAnimationOffset, 0);
« no previous file with comments | « no previous file | ash/wm/app_list_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698