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

Unified Diff: trunk/src/chrome/browser/ui/views/app_list/linux/app_list_linux.cc

Issue 287783002: Revert 270232 "linux_aura: Compile ash into chrome." (Closed) Base URL: svn://svn.chromium.org/chrome/
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: trunk/src/chrome/browser/ui/views/app_list/linux/app_list_linux.cc
===================================================================
--- trunk/src/chrome/browser/ui/views/app_list/linux/app_list_linux.cc (revision 270237)
+++ trunk/src/chrome/browser/ui/views/app_list/linux/app_list_linux.cc (working copy)
@@ -90,8 +90,6 @@
view->SetBubbleArrow(views::BubbleBorder::FLOAT);
- AppListPositioner::ScreenEdge edge;
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
// In the Unity desktop environment, special case SCREEN_EDGE_LEFT. It is
// always on the left side in Unity, but ShelfLocationInDisplay will not
// detect this if the shelf is hidden.
@@ -99,10 +97,10 @@
// applies, but we currently have no way to detect whether Gnome Shell is
// running.
views::LinuxUI* ui = views::LinuxUI::instance();
+ AppListPositioner::ScreenEdge edge;
if (ui && ui->UnityIsRunning())
edge = AppListPositioner::SCREEN_EDGE_LEFT;
else
-#endif
edge = ShelfLocationInDisplay(display);
view->SetAnchorPoint(FindAnchorPoint(view->GetPreferredSize(),
display,

Powered by Google App Engine
This is Rietveld 408576698