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

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

Issue 3447008: base: Finish moving the SplitString functions from string_util.h to string_split.h (Closed) Base URL: git://git.chromium.org/chromium.git
Patch Set: chromeos fixes Created 10 years, 3 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 | « net/websockets/websocket_job_unittest.cc ('k') | webkit/glue/plugins/plugin_lib_mac.mm » ('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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "views/controls/label.h" 5 #include "views/controls/label.h"
6 6
7 #include <cmath> 7 #include <cmath>
8 #include <limits> 8 #include <limits>
9 9
10 #include "app/resource_bundle.h" 10 #include "app/resource_bundle.h"
11 #include "app/text_elider.h" 11 #include "app/text_elider.h"
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_util.h" 15 #include "base/string_util.h"
15 #include "base/utf_string_conversions.h" 16 #include "base/utf_string_conversions.h"
16 #include "gfx/canvas_skia.h" 17 #include "gfx/canvas_skia.h"
17 #include "gfx/color_utils.h" 18 #include "gfx/color_utils.h"
18 #include "gfx/font.h" 19 #include "gfx/font.h"
19 #include "gfx/insets.h" 20 #include "gfx/insets.h"
20 #include "views/background.h" 21 #include "views/background.h"
21 22
22 namespace views { 23 namespace views {
23 24
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
445 *paint_text = gfx::ElideText(text_, font_, width(), true); 446 *paint_text = gfx::ElideText(text_, font_, width(), true);
446 } else { 447 } else {
447 *paint_text = text_; 448 *paint_text = text_;
448 } 449 }
449 450
450 *text_bounds = GetTextBounds(); 451 *text_bounds = GetTextBounds();
451 *flags = ComputeMultiLineFlags(); 452 *flags = ComputeMultiLineFlags();
452 } 453 }
453 454
454 } // namespace views 455 } // namespace views
OLDNEW
« no previous file with comments | « net/websockets/websocket_job_unittest.cc ('k') | webkit/glue/plugins/plugin_lib_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698