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

Unified Diff: chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_container.cc

Issue 2406303003: Move enable_app_list to a buildflag. (Closed)
Patch Set: More grit defines Created 4 years, 2 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/apps/app_info_dialog/app_info_dialog_container.cc
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_container.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_container.cc
index 4f6f9f899fb21f7741205662fe484bc98d6e4176..e2e119218e17315eec873710614a8bd80bf61773 100644
--- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_container.cc
+++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_dialog_container.cc
@@ -8,6 +8,7 @@
#include "base/macros.h"
#include "build/build_config.h"
+#include "chrome/common/features.h"
#include "ui/base/accelerators/accelerator.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_types.h"
@@ -27,7 +28,7 @@
#include "ui/views/window/native_frame_view.h"
#include "ui/views/window/non_client_view.h"
-#if defined(ENABLE_APP_LIST)
+#if BUILDFLAG(ENABLE_APP_LIST)
#include "third_party/skia/include/core/SkPaint.h"
#include "ui/app_list/app_list_constants.h" // nogncheck
#include "ui/views/background.h"
@@ -44,7 +45,7 @@ const views::BubbleBorder::Shadow kShadowType =
views::BubbleBorder::SMALL_SHADOW;
#endif
-#if defined(ENABLE_APP_LIST)
+#if BUILDFLAG(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 {
@@ -123,7 +124,7 @@ class BaseDialogContainer : public views::DialogDelegateView {
DISALLOW_COPY_AND_ASSIGN(BaseDialogContainer);
};
-#if defined(ENABLE_APP_LIST)
+#if BUILDFLAG(ENABLE_APP_LIST)
// The contents view for an App List Dialog, which covers the entire app list
// and adds a close button.
@@ -241,7 +242,7 @@ class NativeDialogContainer : public BaseDialogContainer {
} // namespace
-#if defined(ENABLE_APP_LIST)
+#if BUILDFLAG(ENABLE_APP_LIST)
views::DialogDelegateView* CreateAppListContainerForView(
views::View* view,
const base::Closure& close_callback) {

Powered by Google App Engine
This is Rietveld 408576698