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

Unified Diff: ui/app_list/views/all_apps_tile_item_view.cc

Issue 2934673002: Revert of Draggable peeking/fullscreen launcher with transparent background. (Closed)
Patch Set: Created 3 years, 6 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
« no previous file with comments | « ui/app_list/views/all_apps_tile_item_view.h ('k') | ui/app_list/views/app_list_main_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/all_apps_tile_item_view.cc
diff --git a/ui/app_list/views/all_apps_tile_item_view.cc b/ui/app_list/views/all_apps_tile_item_view.cc
index fd21536c8a98de6fa3b37c54e58b1dd9e3986595..a2bfb8a27a185d4ac05553707a465717b271905f 100644
--- a/ui/app_list/views/all_apps_tile_item_view.cc
+++ b/ui/app_list/views/all_apps_tile_item_view.cc
@@ -6,9 +6,7 @@
#include "base/metrics/histogram_macros.h"
#include "ui/app_list/app_list_constants.h"
-#include "ui/app_list/app_list_features.h"
#include "ui/app_list/resources/grit/app_list_resources.h"
-#include "ui/app_list/views/app_list_view.h"
#include "ui/app_list/views/contents_view.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
@@ -40,9 +38,8 @@
} // namespace
-AllAppsTileItemView::AllAppsTileItemView(ContentsView* contents_view,
- AppListView* app_list_view)
- : contents_view_(contents_view), app_list_view_(app_list_view) {
+AllAppsTileItemView::AllAppsTileItemView(ContentsView* contents_view)
+ : contents_view_(contents_view) {
SetTitle(l10n_util::GetStringUTF16(IDS_APP_LIST_ALL_APPS));
SetHoverStyle(TileItemView::HOVER_STYLE_ANIMATE_SHADOW);
UpdateIcon();
@@ -67,8 +64,6 @@
AppListModel::STATE_LAST);
contents_view_->SetActiveState(AppListModel::STATE_APPS);
- if (features::IsFullscreenAppListEnabled())
- app_list_view_->SetState(AppListView::FULLSCREEN);
}
} // namespace app_list
« no previous file with comments | « ui/app_list/views/all_apps_tile_item_view.h ('k') | ui/app_list/views/app_list_main_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698