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

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

Issue 292443002: linux_aura: Compile ash into chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src
Patch Set: Rebase to ToT 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/linux/app_list_linux.cc
diff --git a/chrome/browser/ui/views/app_list/linux/app_list_linux.cc b/chrome/browser/ui/views/app_list/linux/app_list_linux.cc
index e513121756ca360d80d6c8c1d15a30898d603dbf..936d26d8fd3581d94a46bc979a17792985f4bc4b 100644
--- a/chrome/browser/ui/views/app_list/linux/app_list_linux.cc
+++ b/chrome/browser/ui/views/app_list/linux/app_list_linux.cc
@@ -90,6 +90,8 @@ void AppListLinux::MoveNearCursor(app_list::AppListView* view) {
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.
@@ -97,10 +99,10 @@ void AppListLinux::MoveNearCursor(app_list::AppListView* view) {
// 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