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

Side by Side Diff: ash/ime/candidate_view.cc

Issue 621133002: replace OVERRIDE and FINAL with override and final in ash/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 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
« no previous file with comments | « ash/ime/candidate_view.h ('k') | ash/ime/candidate_view_unittest.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/ime/candidate_view.h" 5 #include "ash/ime/candidate_view.h"
6 6
7 #include "ash/ime/candidate_window_constants.h" 7 #include "ash/ime/candidate_window_constants.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "ui/base/ime/candidate_window.h" 9 #include "ui/base/ime/candidate_window.h"
10 #include "ui/gfx/color_utils.h" 10 #include "ui/gfx/color_utils.h"
(...skipping 12 matching lines...) Expand all
23 // the vertical candidate window. 23 // the vertical candidate window.
24 class VerticalCandidateLabel : public views::Label { 24 class VerticalCandidateLabel : public views::Label {
25 public: 25 public:
26 VerticalCandidateLabel() {} 26 VerticalCandidateLabel() {}
27 27
28 private: 28 private:
29 virtual ~VerticalCandidateLabel() {} 29 virtual ~VerticalCandidateLabel() {}
30 30
31 // Returns the preferred size, but guarantees that the width has at 31 // Returns the preferred size, but guarantees that the width has at
32 // least kMinCandidateLabelWidth pixels. 32 // least kMinCandidateLabelWidth pixels.
33 virtual gfx::Size GetPreferredSize() const OVERRIDE { 33 virtual gfx::Size GetPreferredSize() const override {
34 gfx::Size size = Label::GetPreferredSize(); 34 gfx::Size size = Label::GetPreferredSize();
35 size.SetToMax(gfx::Size(kMinCandidateLabelWidth, 0)); 35 size.SetToMax(gfx::Size(kMinCandidateLabelWidth, 0));
36 size.SetToMin(gfx::Size(kMaxCandidateLabelWidth, size.height())); 36 size.SetToMin(gfx::Size(kMaxCandidateLabelWidth, size.height()));
37 return size; 37 return size;
38 } 38 }
39 39
40 DISALLOW_COPY_AND_ASSIGN(VerticalCandidateLabel); 40 DISALLOW_COPY_AND_ASSIGN(VerticalCandidateLabel);
41 }; 41 };
42 42
43 // Creates the shortcut label, and returns it (never returns NULL). 43 // Creates the shortcut label, and returns it (never returns NULL).
(...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after
292 } 292 }
293 293
294 // Reserves the margin for infolist_icon even if it's not visible. 294 // Reserves the margin for infolist_icon even if it's not visible.
295 size.Enlarge( 295 size.Enlarge(
296 kInfolistIndicatorIconWidth + kInfolistIndicatorIconPadding * 2, 0); 296 kInfolistIndicatorIconWidth + kInfolistIndicatorIconPadding * 2, 0);
297 return size; 297 return size;
298 } 298 }
299 299
300 } // namespace ime 300 } // namespace ime
301 } // namespace ash 301 } // namespace ash
OLDNEW
« no previous file with comments | « ash/ime/candidate_view.h ('k') | ash/ime/candidate_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698