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

Unified Diff: chrome/browser/ui/views/app_list/win/app_list_win.cc

Issue 266193009: Revert of Use experimental app list position whenever virtual keyboard is enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
Index: chrome/browser/ui/views/app_list/win/app_list_win.cc
diff --git a/chrome/browser/ui/views/app_list/win/app_list_win.cc b/chrome/browser/ui/views/app_list/win/app_list_win.cc
index f2d4e820b655dcb67411ad94786acec1ac8ef8d5..85b86e03aa0380be22d078d5abd5d7ed9d38524f 100644
--- a/chrome/browser/ui/views/app_list/win/app_list_win.cc
+++ b/chrome/browser/ui/views/app_list/win/app_list_win.cc
@@ -46,8 +46,7 @@
gfx::Point AppListWin::FindAnchorPoint(const gfx::Size& view_size,
const gfx::Display& display,
const gfx::Point& cursor,
- const gfx::Rect& taskbar_rect,
- bool center_window) {
+ const gfx::Rect& taskbar_rect) {
AppListPositioner positioner(display, view_size, kMinDistanceFromEdge);
// Subtract the taskbar area since the display's default work_area will not
@@ -56,7 +55,7 @@
positioner.WorkAreaSubtract(taskbar_rect);
// Special case for app list in the center of the screen.
- if (center_window)
+ if (app_list::switches::IsCenteredAppListEnabled())
return positioner.GetAnchorPointForScreenCenter();
// Find which edge of the screen the taskbar is attached to.
@@ -87,9 +86,6 @@
view->SetBubbleArrow(views::BubbleBorder::FLOAT);
gfx::Rect taskbar_rect;
GetTaskbarRect(&taskbar_rect);
- view->SetAnchorPoint(FindAnchorPoint(view->GetPreferredSize(),
- display,
- cursor,
- taskbar_rect,
- view->ShouldCenterWindow()));
+ view->SetAnchorPoint(
+ FindAnchorPoint(view->GetPreferredSize(), display, cursor, taskbar_rect));
}
« no previous file with comments | « chrome/browser/ui/views/app_list/win/app_list_win.h ('k') | chrome/browser/ui/views/app_list/win/app_list_win_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698