diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 18:54:01 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-07 18:54:01 +0000 |
| commit | c7057fbe6fa877c3379bd1bd36d69c6158fb68a4 (patch) | |
| tree | 78b6f6728adedf6db33d8ccf8e87f23a79900118 /ui/views/controls/button | |
| parent | 41be2504792a9625b94edb19e0f4f058ec002d72 (diff) | |
| download | chromium_src-c7057fbe6fa877c3379bd1bd36d69c6158fb68a4.zip chromium_src-c7057fbe6fa877c3379bd1bd36d69c6158fb68a4.tar.gz chromium_src-c7057fbe6fa877c3379bd1bd36d69c6158fb68a4.tar.bz2 | |
Use a direct include of utf_string_conversions.h in ui/.
BUG=none
TEST=none
TBR=ben@chromium.org
Review URL: https://chromiumcodereview.appspot.com/16175008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204885 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/controls/button')
| -rw-r--r-- | ui/views/controls/button/button.cc | 2 | ||||
| -rw-r--r-- | ui/views/controls/button/button_dropdown.cc | 2 | ||||
| -rw-r--r-- | ui/views/controls/button/image_button.cc | 2 | ||||
| -rw-r--r-- | ui/views/controls/button/label_button_unittest.cc | 2 | ||||
| -rw-r--r-- | ui/views/controls/button/menu_button.cc | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/ui/views/controls/button/button.cc b/ui/views/controls/button/button.cc index f99f06c..eccec03 100644 --- a/ui/views/controls/button/button.cc +++ b/ui/views/controls/button/button.cc @@ -4,7 +4,7 @@ #include "ui/views/controls/button/button.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "ui/base/accessibility/accessible_view_state.h" namespace views { diff --git a/ui/views/controls/button/button_dropdown.cc b/ui/views/controls/button/button_dropdown.cc index cfab435..a243cee 100644 --- a/ui/views/controls/button/button_dropdown.cc +++ b/ui/views/controls/button/button_dropdown.cc @@ -7,7 +7,7 @@ #include "base/bind.h" #include "base/compiler_specific.h" #include "base/message_loop.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "grit/ui_strings.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/l10n/l10n_util.h" diff --git a/ui/views/controls/button/image_button.cc b/ui/views/controls/button/image_button.cc index df74249..ff355eb 100644 --- a/ui/views/controls/button/image_button.cc +++ b/ui/views/controls/button/image_button.cc @@ -4,7 +4,7 @@ #include "ui/views/controls/button/image_button.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/animation/throb_animation.h" #include "ui/gfx/canvas.h" diff --git a/ui/views/controls/button/label_button_unittest.cc b/ui/views/controls/button/label_button_unittest.cc index 0cc8b27..fe2d1f6 100644 --- a/ui/views/controls/button/label_button_unittest.cc +++ b/ui/views/controls/button/label_button_unittest.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/gfx/canvas.h" #include "ui/gfx/font.h" diff --git a/ui/views/controls/button/menu_button.cc b/ui/views/controls/button/menu_button.cc index 4a89552..765c9ef 100644 --- a/ui/views/controls/button/menu_button.cc +++ b/ui/views/controls/button/menu_button.cc @@ -4,7 +4,7 @@ #include "ui/views/controls/button/menu_button.h" -#include "base/utf_string_conversions.h" +#include "base/strings/utf_string_conversions.h" #include "grit/ui_resources.h" #include "grit/ui_strings.h" #include "ui/base/accessibility/accessible_view_state.h" |