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_; |