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

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

Issue 23228004: Prepare to use gfx::RenderText in views::Label. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix multiline LabelButton layout and sizing. Created 6 years, 5 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/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 a55102bc1bc444506a4bb1de34a0107ed8b5c06c..7861683499beb6c6e871c6964132b692ae413a49 100644
--- a/ui/app_list/views/app_list_item_view.h
+++ b/ui/app_list/views/app_list_item_view.h
@@ -12,7 +12,6 @@
#include "base/timer/timer.h"
#include "ui/app_list/app_list_export.h"
#include "ui/app_list/app_list_item_observer.h"
-#include "ui/app_list/views/cached_label.h"
#include "ui/gfx/shadow_value.h"
#include "ui/views/context_menu_controller.h"
#include "ui/views/controls/button/custom_button.h"
@@ -43,8 +42,6 @@ class APP_LIST_EXPORT AppListItemView : public views::CustomButton,
void SetIconSize(const gfx::Size& size);
- void Prerender();
-
void CancelContextMenu();
gfx::ImageSkia GetDragImage();
@@ -92,10 +89,6 @@ class APP_LIST_EXPORT AppListItemView : public views::CustomButton,
// Invoked when |mouse_drag_timer_| fires to show dragging UI.
void OnMouseDragTimer();
- // If the item is not in a folder, not highlighted, not being dragged, and not
- // having something dropped onto it, enables subpixel AA for the title.
- void SetTitleSubpixelAA();
-
// AppListItemObserver overrides:
virtual void ItemIconChanged() OVERRIDE;
virtual void ItemNameChanged() OVERRIDE;
@@ -106,7 +99,6 @@ class APP_LIST_EXPORT AppListItemView : public views::CustomButton,
// views::View overrides:
virtual const char* GetClassName() const OVERRIDE;
virtual void Layout() OVERRIDE;
- virtual void SchedulePaintInRect(const gfx::Rect& r) OVERRIDE;
virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
// views::ContextMenuController overrides:
@@ -132,7 +124,7 @@ class APP_LIST_EXPORT AppListItemView : public views::CustomButton,
AppsGridView* apps_grid_view_; // Owned by views hierarchy.
views::ImageView* icon_; // Owned by views hierarchy.
- CachedLabel* title_; // Owned by views hierarchy.
+ views::Label* title_; // Owned by views hierarchy.
ProgressBarView* progress_bar_; // Owned by views hierarchy.
scoped_ptr<views::MenuRunner> context_menu_runner_;

Powered by Google App Engine
This is Rietveld 408576698