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

Side by Side Diff: ash/system/tray/tray_details_view.cc

Issue 82483003: Add GetMinimumSize() for Borders, and make LabelButton auto-size to at least as (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 7 years 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ash/system/tray/tray_details_view.h" 5 #include "ash/system/tray/tray_details_view.h"
6 6
7 #include "ash/system/tray/fixed_sized_scroll_view.h" 7 #include "ash/system/tray/fixed_sized_scroll_view.h"
8 #include "ash/system/tray/system_tray_item.h" 8 #include "ash/system/tray/system_tray_item.h"
9 #include "ash/system/tray/tray_constants.h" 9 #include "ash/system/tray/tray_constants.h"
10 #include "ui/gfx/canvas.h" 10 #include "ui/gfx/canvas.h"
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 if (!visible_) 46 if (!visible_)
47 return; 47 return;
48 canvas->FillRect(gfx::Rect(0, view.height() - 1, view.width(), 1), 48 canvas->FillRect(gfx::Rect(0, view.height() - 1, view.width(), 1),
49 kBorderLightColor); 49 kBorderLightColor);
50 } 50 }
51 51
52 virtual gfx::Insets GetInsets() const OVERRIDE { 52 virtual gfx::Insets GetInsets() const OVERRIDE {
53 return gfx::Insets(0, 0, 1, 0); 53 return gfx::Insets(0, 0, 1, 0);
54 } 54 }
55 55
56 virtual gfx::Size GetMinimumSize() const OVERRIDE {
57 return gfx::Size(0, 1);
58 }
59
56 bool visible_; 60 bool visible_;
57 61
58 DISALLOW_COPY_AND_ASSIGN(ScrollBorder); 62 DISALLOW_COPY_AND_ASSIGN(ScrollBorder);
59 }; 63 };
60 64
61 TrayDetailsView::TrayDetailsView(SystemTrayItem* owner) 65 TrayDetailsView::TrayDetailsView(SystemTrayItem* owner)
62 : owner_(owner), 66 : owner_(owner),
63 footer_(NULL), 67 footer_(NULL),
64 scroller_(NULL), 68 scroller_(NULL),
65 scroll_content_(NULL), 69 scroll_content_(NULL),
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
140 scroll_border_->set_visible(true); 144 scroll_border_->set_visible(true);
141 else 145 else
142 scroll_border_->set_visible(false); 146 scroll_border_->set_visible(false);
143 } 147 }
144 148
145 views::View::OnPaintBorder(canvas); 149 views::View::OnPaintBorder(canvas);
146 } 150 }
147 151
148 } // namespace internal 152 } // namespace internal
149 } // namespace ash 153 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698