Make the ENABLE_APP_LIST build flag work on Linux

chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc

Index: chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc
index b09f4a4f9b13e7be38ca32b64fdac15933a06111..688a37cf8c57f7e56e700d41cee69b906982ae75 100644
--- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc
+++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_views.cc
@@ -11,8 +11,7 @@
 #include "build/build_config.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
-#include "chrome/browser/ui/views/app_list/app_list_dialog_container.h"
+#include "chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_container.h"
 #include "chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.h"
 #include "chrome/browser/ui/views/apps/app_info_dialog/app_info_header_panel.h"
 #include "chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel.h"
@@ -23,8 +22,6 @@
 #include "extensions/browser/extension_registry.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/manifest.h"
-#include "ui/app_list/app_list_constants.h"
-#include "ui/app_list/app_list_switches.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/border.h"
@@ -34,6 +31,12 @@
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
+#if defined(ENABLE_APP_LIST)
+#include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
+#include "ui/app_list/app_list_constants.h"
+#include "ui/app_list/app_list_switches.h"
+#endif
+
 namespace {
 
 #if defined(OS_MACOSX)
@@ -63,6 +66,7 @@ gfx::Size GetAppInfoNativeDialogSize() {
   return gfx::Size(380, 490);
 }
 
+#if defined(ENABLE_APP_LIST)
 void ShowAppInfoInAppList(gfx::NativeWindow parent,
                           const gfx::Rect& app_list_bounds,
                           Profile* profile,
@@ -83,6 +87,7 @@ void ShowAppInfoInAppList(gfx::NativeWindow parent,
   dialog_widget->SetBounds(app_list_bounds);
   dialog_widget->Show();
 }
+#endif
 
 void ShowAppInfoInNativeDialog(content::WebContents* web_contents,
                                const gfx::Size& size,
@@ -125,13 +130,17 @@ AppInfoDialog::AppInfoDialog(gfx::NativeWindow parent_window,
   SetLayoutManager(layout);
 
   const int kHorizontalSeparatorHeight = 1;
+  // TODO(wierichs): Put this into an appropriate constants file:
+  // const SkColor kDialogSeparatorColor = SkColorSetRGB(0xD1, 0xD1, 0xD1);
+  const SkColor dialogSeparatorColor = SkColorSetRGB(0xD1, 0xD1, 0xD1);

[Matt Giuca, 2016/02/29 02:52:37]

No need for a comment here. I think this is fine (since it is only used in this
one place). Also you should never have commented-out lines of code.

Rename this constant to kDialogSeparatorColor. We still use the k prefix for
constants even if they are local (see kHorizontalSeparatorHeight just above).

+
   dialog_header_ = new AppInfoHeaderPanel(profile, app);
   dialog_header_->SetBorder(views::Border::CreateSolidSidedBorder(
-      0, 0, kHorizontalSeparatorHeight, 0, app_list::kDialogSeparatorColor));
+      0, 0, kHorizontalSeparatorHeight, 0, dialogSeparatorColor));
 
   dialog_footer_ = new AppInfoFooterPanel(parent_window, profile, app);
   dialog_footer_->SetBorder(views::Border::CreateSolidSidedBorder(
-      kHorizontalSeparatorHeight, 0, 0, 0, app_list::kDialogSeparatorColor));
+      kHorizontalSeparatorHeight, 0, 0, 0, dialogSeparatorColor));
   if (!dialog_footer_->has_children()) {
     // If there are no controls in the footer, don't add it to the dialog.
     delete dialog_footer_;