| Index: ash/shelf/shelf_tooltip_manager.cc
|
| diff --git a/ash/shelf/shelf_tooltip_manager.cc b/ash/shelf/shelf_tooltip_manager.cc
|
| index cc80bdba7979780fd5aa539488aedaf3046ff11e..b4e1d347b4bedf3c58f817fc1ae41b200afa8ce4 100644
|
| --- a/ash/shelf/shelf_tooltip_manager.cc
|
| +++ b/ash/shelf/shelf_tooltip_manager.cc
|
| @@ -60,7 +60,7 @@ class ShelfTooltipManager::ShelfTooltipBubble
|
| virtual void WindowClosing() OVERRIDE;
|
|
|
| // views::View overrides:
|
| - virtual gfx::Size GetPreferredSize() OVERRIDE;
|
| + virtual gfx::Size GetPreferredSize() const OVERRIDE;
|
|
|
| ShelfTooltipManager* host_;
|
| views::Label* label_;
|
| @@ -124,7 +124,7 @@ void ShelfTooltipManager::ShelfTooltipBubble::WindowClosing() {
|
| host_->OnBubbleClosed(this);
|
| }
|
|
|
| -gfx::Size ShelfTooltipManager::ShelfTooltipBubble::GetPreferredSize() {
|
| +gfx::Size ShelfTooltipManager::ShelfTooltipBubble::GetPreferredSize() const {
|
| gfx::Size pref_size = views::BubbleDelegateView::GetPreferredSize();
|
| if (pref_size.height() < kTooltipMinHeight)
|
| pref_size.set_height(kTooltipMinHeight);
|
|
|