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

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

Issue 467193003: ui: Remove unneeded includes of grit/ui_resources.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 6 years, 4 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 | « ui/views/controls/button/label_button.cc ('k') | ui/views/controls/menu/menu_config_mac.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) 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 "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/strings/string_split.h" 14 #include "base/strings/string_split.h"
15 #include "base/strings/string_util.h" 15 #include "base/strings/string_util.h"
16 #include "base/strings/utf_string_conversions.h" 16 #include "base/strings/utf_string_conversions.h"
17 #include "ui/accessibility/ax_view_state.h" 17 #include "ui/accessibility/ax_view_state.h"
18 #include "ui/base/resource/resource_bundle.h"
19 #include "ui/gfx/canvas.h" 18 #include "ui/gfx/canvas.h"
20 #include "ui/gfx/color_utils.h" 19 #include "ui/gfx/color_utils.h"
21 #include "ui/gfx/insets.h" 20 #include "ui/gfx/insets.h"
22 #include "ui/gfx/text_elider.h" 21 #include "ui/gfx/text_elider.h"
23 #include "ui/gfx/text_utils.h" 22 #include "ui/gfx/text_utils.h"
24 #include "ui/gfx/utf16_indexing.h" 23 #include "ui/gfx/utf16_indexing.h"
25 #include "ui/native_theme/native_theme.h" 24 #include "ui/native_theme/native_theme.h"
26 #include "ui/views/background.h" 25 #include "ui/views/background.h"
27 26
28 namespace { 27 namespace {
(...skipping 501 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 } 529 }
531 530
532 bool Label::ShouldShowDefaultTooltip() const { 531 bool Label::ShouldShowDefaultTooltip() const {
533 const gfx::Size text_size = GetTextSize(); 532 const gfx::Size text_size = GetTextSize();
534 const gfx::Size size = GetContentsBounds().size(); 533 const gfx::Size size = GetContentsBounds().size();
535 return !obscured() && (text_size.width() > size.width() || 534 return !obscured() && (text_size.width() > size.width() ||
536 (multi_line_ && text_size.height() > size.height())); 535 (multi_line_ && text_size.height() > size.height()));
537 } 536 }
538 537
539 } // namespace views 538 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/button/label_button.cc ('k') | ui/views/controls/menu/menu_config_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698