summaryrefslogtreecommitdiffstats
path: root/ui/base/clipboard/clipboard_win.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-07 03:59:06 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-07 03:59:06 +0000
commita3f72189102fc85a7f9cfe60c61e124a2677f0ea (patch)
treefa5699e92f87a628740fd9b88960b6449541055d /ui/base/clipboard/clipboard_win.cc
parent3d350326fd4def19e343890c55c5388e370c7c2f (diff)
downloadchromium_src-a3f72189102fc85a7f9cfe60c61e124a2677f0ea.zip
chromium_src-a3f72189102fc85a7f9cfe60c61e124a2677f0ea.tar.gz
chromium_src-a3f72189102fc85a7f9cfe60c61e124a2677f0ea.tar.bz2
Move utf_offset_string_conversions and utf_string_conversion_utils to strings.
Review URL: https://codereview.chromium.org/12087115 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@181183 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/base/clipboard/clipboard_win.cc')
-rw-r--r--ui/base/clipboard/clipboard_win.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/base/clipboard/clipboard_win.cc b/ui/base/clipboard/clipboard_win.cc
index 945d0cc..e36ea04 100644
--- a/ui/base/clipboard/clipboard_win.cc
+++ b/ui/base/clipboard/clipboard_win.cc
@@ -19,7 +19,7 @@
#include "base/stl_util.h"
#include "base/string_number_conversions.h"
#include "base/string_util.h"
-#include "base/utf_offset_string_conversions.h"
+#include "base/strings/utf_offset_string_conversions.h"
#include "base/utf_string_conversions.h"
#include "base/win/scoped_gdi_object.h"
#include "base/win/scoped_hdc.h"
@@ -514,8 +514,8 @@ void Clipboard::ReadHTML(Clipboard::Buffer buffer, string16* markup,
std::vector<size_t> offsets;
offsets.push_back(start_index - html_start);
offsets.push_back(end_index - html_start);
- markup->assign(UTF8ToUTF16AndAdjustOffsets(cf_html.data() + html_start,
- &offsets));
+ markup->assign(base::UTF8ToUTF16AndAdjustOffsets(cf_html.data() + html_start,
+ &offsets));
*fragment_start = base::checked_numeric_cast<uint32>(offsets[0]);
*fragment_end = base::checked_numeric_cast<uint32>(offsets[1]);
}