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

Unified Diff: ash/ime/candidate_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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/ime/candidate_view.h ('k') | ash/ime/candidate_window_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/ime/candidate_view.cc
diff --git a/ash/ime/candidate_view.cc b/ash/ime/candidate_view.cc
index 4071071255427cd0160e57c5d4e7ee5a6c52364f..e99167f0f90ae830a053feb1d6ae161a5b087d4e 100644
--- a/ash/ime/candidate_view.cc
+++ b/ash/ime/candidate_view.cc
@@ -30,7 +30,7 @@ class VerticalCandidateLabel : public views::Label {
// Returns the preferred size, but guarantees that the width has at
// least kMinCandidateLabelWidth pixels.
- virtual gfx::Size GetPreferredSize() OVERRIDE {
+ virtual gfx::Size GetPreferredSize() const OVERRIDE {
gfx::Size size = Label::GetPreferredSize();
size.SetToMax(gfx::Size(kMinCandidateLabelWidth, 0));
size.SetToMin(gfx::Size(kMaxCandidateLabelWidth, size.height()));
@@ -272,7 +272,7 @@ void CandidateView::Layout() {
annotation_label_->SetBounds(x, 0, right - x, height());
}
-gfx::Size CandidateView::GetPreferredSize() {
+gfx::Size CandidateView::GetPreferredSize() const {
const int padding_width =
orientation_ == ui::CandidateWindow::VERTICAL ? 4 : 6;
gfx::Size size;
« no previous file with comments | « ash/ime/candidate_view.h ('k') | ash/ime/candidate_window_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698