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

Side by Side Diff: ui/views/controls/label.cc

Issue 8771006: views: Move the remaining file from views/ to ui/views/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 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
« no previous file with comments | « ui/views/controls/focusable_border.h ('k') | ui/views/controls/label_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 (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "ui/views/controls/label.h" 5 #include "ui/views/controls/label.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <cmath> 8 #include <cmath>
9 #include <limits> 9 #include <limits>
10 #include <vector> 10 #include <vector>
11 11
12 #include "base/i18n/rtl.h" 12 #include "base/i18n/rtl.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/string_split.h" 14 #include "base/string_split.h"
15 #include "base/string_util.h" 15 #include "base/string_util.h"
16 #include "base/utf_string_conversions.h" 16 #include "base/utf_string_conversions.h"
17 #include "ui/base/accessibility/accessible_view_state.h" 17 #include "ui/base/accessibility/accessible_view_state.h"
18 #include "ui/base/resource/resource_bundle.h" 18 #include "ui/base/resource/resource_bundle.h"
19 #include "ui/base/text/text_elider.h" 19 #include "ui/base/text/text_elider.h"
20 #include "ui/gfx/canvas_skia.h" 20 #include "ui/gfx/canvas_skia.h"
21 #include "ui/gfx/color_utils.h" 21 #include "ui/gfx/color_utils.h"
22 #include "ui/gfx/font.h" 22 #include "ui/gfx/font.h"
23 #include "ui/gfx/insets.h" 23 #include "ui/gfx/insets.h"
24 #include "views/background.h" 24 #include "ui/views/background.h"
25 25
26 namespace views { 26 namespace views {
27 27
28 // static 28 // static
29 const char Label::kViewClassName[] = "views/Label"; 29 const char Label::kViewClassName[] = "views/Label";
30 30
31 const int Label::kFocusBorderPadding = 1; 31 const int Label::kFocusBorderPadding = 1;
32 32
33 Label::Label() { 33 Label::Label() {
34 Init(string16(), GetDefaultFont()); 34 Init(string16(), GetDefaultFont());
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after
494 // it is right aligned. Otherwise, its directionality is forced to be LTR. 494 // it is right aligned. Otherwise, its directionality is forced to be LTR.
495 if (rtl_alignment_mode_ == AUTO_DETECT_ALIGNMENT) { 495 if (rtl_alignment_mode_ == AUTO_DETECT_ALIGNMENT) {
496 if (horiz_alignment_ == ALIGN_RIGHT) 496 if (horiz_alignment_ == ALIGN_RIGHT)
497 *flags |= gfx::Canvas::FORCE_RTL_DIRECTIONALITY; 497 *flags |= gfx::Canvas::FORCE_RTL_DIRECTIONALITY;
498 else 498 else
499 *flags |= gfx::Canvas::FORCE_LTR_DIRECTIONALITY; 499 *flags |= gfx::Canvas::FORCE_LTR_DIRECTIONALITY;
500 } 500 }
501 } 501 }
502 502
503 } // namespace views 503 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/focusable_border.h ('k') | ui/views/controls/label_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698