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

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

Issue 2898743002: Draggable peeking/fullscreen launcher with transparent background. (Closed)
Patch Set: Rebased to fix merge conflicts and addressed comments. Created 3 years, 7 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: 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 1cc2690ec7b2ea1b26ea94d42bf7443597848941..185f917940d3a057dbb4ec0f468f44b52d8d1f41 100644
--- a/ui/app_list/views/all_apps_tile_item_view.cc
+++ b/ui/app_list/views/all_apps_tile_item_view.cc
@@ -6,7 +6,9 @@
#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"
@@ -14,6 +16,7 @@
#include "ui/gfx/image/canvas_image_source.h"
#include "ui/resources/grit/ui_resources.h"
#include "ui/strings/grit/ui_strings.h"
+#include "ui/views/widget/widget.h"
xiyuan 2017/05/30 22:18:50 nit: unused ?
newcomer 2017/06/01 01:42:54 Done.
namespace app_list {
@@ -39,8 +42,9 @@ class AllAppsImageSource : public gfx::CanvasImageSource {
} // namespace
-AllAppsTileItemView::AllAppsTileItemView(ContentsView* contents_view)
- : contents_view_(contents_view) {
+AllAppsTileItemView::AllAppsTileItemView(ContentsView* contents_view,
+ AppListView* app_list_view)
+ : contents_view_(contents_view), app_list_view_(app_list_view) {
SetTitle(l10n_util::GetStringUTF16(IDS_APP_LIST_ALL_APPS));
SetHoverStyle(TileItemView::HOVER_STYLE_ANIMATE_SHADOW);
UpdateIcon();
@@ -65,6 +69,8 @@ void AllAppsTileItemView::ButtonPressed(views::Button* sender,
AppListModel::STATE_LAST);
contents_view_->SetActiveState(AppListModel::STATE_APPS);
+ if (features::IsFullscreenAppListEnabled())
+ app_list_view_->ToFullscreen();
}
} // namespace app_list

Powered by Google App Engine
This is Rietveld 408576698