Make the ENABLE_APP_LIST build flag work on Linux

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

Index: chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_container.cc
diff --git a/chrome/browser/ui/views/app_list/app_list_dialog_container.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_container.cc
similarity index 96%
rename from chrome/browser/ui/views/app_list/app_list_dialog_container.cc
rename to chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_container.cc
index dd2c4f2ecdb7623c6040f1c05c6de7104b8e90a5..8d29acd8dd252a1a177317b7d2b60cf0b72639a5 100644
--- a/chrome/browser/ui/views/app_list/app_list_dialog_container.cc
+++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_container.cc
@@ -1,16 +1,14 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#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 <utility>
 
 #include "base/macros.h"
 #include "build/build_config.h"
 #include "chrome/browser/ui/host_desktop.h"
-#include "third_party/skia/include/core/SkPaint.h"
-#include "ui/app_list/app_list_constants.h"
 #include "ui/base/accelerators/accelerator.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_types.h"
@@ -19,7 +17,6 @@
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/resources/grit/ui_resources.h"
-#include "ui/views/background.h"
 #include "ui/views/border.h"
 #include "ui/views/bubble/bubble_border.h"
 #include "ui/views/bubble/bubble_frame_view.h"
@@ -31,6 +28,12 @@
 #include "ui/views/window/native_frame_view.h"
 #include "ui/views/window/non_client_view.h"
 
+#if defined(ENABLE_APP_LIST)
+#include "third_party/skia/include/core/SkPaint.h"
+#include "ui/app_list/app_list_constants.h"
+#include "ui/views/background.h"
+#endif
+
 namespace {
 
 #if defined(OS_MACOSX)
@@ -42,6 +45,7 @@ const views::BubbleBorder::Shadow kShadowType =
     views::BubbleBorder::SMALL_SHADOW;
 #endif
 
+#if defined(ENABLE_APP_LIST)
 // The background for App List dialogs, which appears as a rounded rectangle
 // with the same border radius and color as the app list contents.
 class AppListOverlayBackground : public views::Background {
@@ -66,6 +70,7 @@ class AppListOverlayBackground : public views::Background {
  private:
   DISALLOW_COPY_AND_ASSIGN(AppListOverlayBackground);
 };
+#endif
 
 // Base container for modal dialogs. Encases a content view in a modal dialog
 // with an accelerator to close on escape.
@@ -120,6 +125,7 @@ class BaseDialogContainer : public views::DialogDelegateView {
   DISALLOW_COPY_AND_ASSIGN(BaseDialogContainer);
 };
 
+#if defined(ENABLE_APP_LIST)
 // The contents view for an App List Dialog, which covers the entire app list
 // and adds a close button.
 class AppListDialogContainer : public BaseDialogContainer,
@@ -167,6 +173,7 @@ class AppListDialogContainer : public BaseDialogContainer,
 
   DISALLOW_COPY_AND_ASSIGN(AppListDialogContainer);
 };
+#endif
 
 // A BubbleFrameView that allows its client view to extend all the way to the
 // top of the dialog, overlapping the BubbleFrameView's close button. This
@@ -232,11 +239,13 @@ class NativeDialogContainer : public BaseDialogContainer {
 
 }  // namespace
 
+#if defined(ENABLE_APP_LIST)
 views::DialogDelegateView* CreateAppListContainerForView(
     views::View* view,
     const base::Closure& close_callback) {
   return new AppListDialogContainer(view, close_callback);
 }
+#endif
 
 views::DialogDelegateView* CreateDialogContainerForView(
     views::View* view,