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

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

Issue 1747773002: Make the ENABLE_APP_LIST build flag work on Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 2016 header Created 4 years, 10 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_footer_panel.cc
diff --git a/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc b/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc
index 050de03cfdc3b06845411a3b70cc10cdb1ba1955..3462ce3e8b9c4f60d8d5ae27e77e91e124fd0d1c 100644
--- a/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc
+++ b/chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.cc
@@ -5,7 +5,6 @@
#include "chrome/browser/ui/views/apps/app_info_dialog/app_info_footer_panel.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
#include "chrome/browser/ui/browser_dialogs.h"
#include "chrome/browser/ui/host_desktop.h"
#include "chrome/common/extensions/extension_constants.h"
@@ -22,6 +21,10 @@
#include "ui/views/view.h"
#include "ui/views/widget/widget.h"
+#if defined(ENABLE_APP_LIST)
+#include "chrome/browser/ui/app_list/app_list_controller_delegate.h"
+#endif
+
#if defined(USE_ASH)
#include "ash/shelf/shelf_delegate.h"
#include "ash/shell.h"
@@ -60,6 +63,7 @@ void AppInfoFooterPanel::CreateButtons() {
create_shortcuts_button_->SetStyle(views::Button::STYLE_BUTTON);
}
+#if defined(ENABLE_APP_LIST)
Matt Giuca 2016/02/29 02:52:37 Why is this app-list specific? This is controls wh
if (CanSetPinnedToShelf()) {
pin_to_shelf_button_ = new views::LabelButton(
this, l10n_util::GetStringUTF16(IDS_APP_LIST_CONTEXT_MENU_PIN));
@@ -68,6 +72,7 @@ void AppInfoFooterPanel::CreateButtons() {
this, l10n_util::GetStringUTF16(IDS_APP_LIST_CONTEXT_MENU_UNPIN));
unpin_from_shelf_button_->SetStyle(views::Button::STYLE_BUTTON);
}
+#endif
if (CanUninstallApp()) {
remove_button_ = new views::LabelButton(

Powered by Google App Engine
This is Rietveld 408576698