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

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

Issue 273223002: views: Make view::Views::GetPreferredSize() const. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: More compile fix for ToT Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ash/system/tray/tray_bar_button_with_title.cc ('k') | ash/system/tray/tray_item_view.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.h" 8 #include "ash/system/tray/system_tray.h"
9 #include "ash/system/tray/system_tray_item.h" 9 #include "ash/system/tray/system_tray_item.h"
10 #include "ash/system/tray/tray_constants.h" 10 #include "ash/system/tray/tray_constants.h"
11 #include "ui/gfx/canvas.h" 11 #include "ui/gfx/canvas.h"
12 #include "ui/views/background.h" 12 #include "ui/views/background.h"
13 #include "ui/views/border.h" 13 #include "ui/views/border.h"
14 #include "ui/views/controls/scroll_view.h" 14 #include "ui/views/controls/scroll_view.h"
15 #include "ui/views/layout/box_layout.h" 15 #include "ui/views/layout/box_layout.h"
16 16
17 namespace ash { 17 namespace ash {
18 18
19 class ScrollSeparator : public views::View { 19 class ScrollSeparator : public views::View {
20 public: 20 public:
21 ScrollSeparator() {} 21 ScrollSeparator() {}
22 22
23 virtual ~ScrollSeparator() {} 23 virtual ~ScrollSeparator() {}
24 24
25 private: 25 private:
26 // Overriden from views::View. 26 // Overriden from views::View.
27 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE { 27 virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE {
28 canvas->FillRect(gfx::Rect(0, height() / 2, width(), 1), kBorderLightColor); 28 canvas->FillRect(gfx::Rect(0, height() / 2, width(), 1), kBorderLightColor);
29 } 29 }
30 virtual gfx::Size GetPreferredSize() OVERRIDE { 30 virtual gfx::Size GetPreferredSize() const OVERRIDE {
31 return gfx::Size(1, kTrayPopupScrollSeparatorHeight); 31 return gfx::Size(1, kTrayPopupScrollSeparatorHeight);
32 } 32 }
33 33
34 DISALLOW_COPY_AND_ASSIGN(ScrollSeparator); 34 DISALLOW_COPY_AND_ASSIGN(ScrollSeparator);
35 }; 35 };
36 36
37 class ScrollBorder : public views::Border { 37 class ScrollBorder : public views::Border {
38 public: 38 public:
39 ScrollBorder() {} 39 ScrollBorder() {}
40 virtual ~ScrollBorder() {} 40 virtual ~ScrollBorder() {}
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 if (index < child_count() - 1 && child_at(index + 1) != footer_) 159 if (index < child_count() - 1 && child_at(index + 1) != footer_)
160 scroll_border_->set_visible(true); 160 scroll_border_->set_visible(true);
161 else 161 else
162 scroll_border_->set_visible(false); 162 scroll_border_->set_visible(false);
163 } 163 }
164 164
165 views::View::OnPaintBorder(canvas); 165 views::View::OnPaintBorder(canvas);
166 } 166 }
167 167
168 } // namespace ash 168 } // namespace ash
OLDNEW
« no previous file with comments | « ash/system/tray/tray_bar_button_with_title.cc ('k') | ash/system/tray/tray_item_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698