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

Unified Diff: ui/app_list/views/app_list_item_view.h

Issue 2945343003: cros: update app list item view for all apps grid view (Closed)
Patch Set: feedback 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/app_list_constants.cc ('k') | ui/app_list/views/app_list_item_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/app_list/views/app_list_item_view.h
diff --git a/ui/app_list/views/app_list_item_view.h b/ui/app_list/views/app_list_item_view.h
index 96704385c79cf9962591b3eef66f68e3a569199d..f77a9be3ff32bef132164ca32e887b430ca6c3d9 100644
--- a/ui/app_list/views/app_list_item_view.h
+++ b/ui/app_list/views/app_list_item_view.h
@@ -127,6 +127,7 @@ class APP_LIST_EXPORT AppListItemView : public views::CustomButton,
// views::View overrides:
const char* GetClassName() const override;
void Layout() override;
+ gfx::Size CalculatePreferredSize() const override;
bool OnKeyPressed(const ui::KeyEvent& event) override;
bool OnMousePressed(const ui::MouseEvent& event) override;
void OnMouseReleased(const ui::MouseEvent& event) override;
@@ -151,15 +152,17 @@ class APP_LIST_EXPORT AppListItemView : public views::CustomButton,
std::unique_ptr<views::MenuRunner> context_menu_runner_;
- UIState ui_state_;
+ UIState ui_state_ = UI_STATE_NORMAL;
// True if scroll gestures should contribute to dragging.
- bool touch_dragging_;
+ bool touch_dragging_ = false;
ImageShadowAnimator shadow_animator_;
- bool is_installing_;
- bool is_highlighted_;
+ bool is_installing_ = false;
+ bool is_highlighted_ = false;
+
+ const bool is_fullscreen_app_list_enabled_;
base::string16 tooltip_text_;
« no previous file with comments | « ui/app_list/app_list_constants.cc ('k') | ui/app_list/views/app_list_item_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698