diff options
Diffstat (limited to 'ui')
-rw-r--r-- | ui/base/webui/jstemplate_builder.cc | 2 | ||||
-rw-r--r-- | ui/gfx/text_elider_unittest.cc | 2 | ||||
-rw-r--r-- | ui/message_center/views/bounded_label_unittest.cc | 2 | ||||
-rw-r--r-- | ui/views/controls/menu/native_menu_win.cc | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/ui/base/webui/jstemplate_builder.cc b/ui/base/webui/jstemplate_builder.cc index 2aa80a3..3e9d411 100644 --- a/ui/base/webui/jstemplate_builder.cc +++ b/ui/base/webui/jstemplate_builder.cc @@ -27,7 +27,7 @@ void AppendJsonHtml(const base::DictionaryValue* json, std::string* output) { // </ confuses the HTML parser because it could be a </script> tag. So we // replace </ with <\/. The extra \ will be ignored by the JS engine. - ReplaceSubstringsAfterOffset(&javascript_string, 0, "</", "<\\/"); + base::ReplaceSubstringsAfterOffset(&javascript_string, 0, "</", "<\\/"); output->append("<script>"); output->append(javascript_string); diff --git a/ui/gfx/text_elider_unittest.cc b/ui/gfx/text_elider_unittest.cc index 8122c42..5eeea5c 100644 --- a/ui/gfx/text_elider_unittest.cc +++ b/ui/gfx/text_elider_unittest.cc @@ -783,7 +783,7 @@ TEST(TextEliderTest, MAYBE_ElideRectangleTextLongWords) { cases[i].wrap_behavior, &lines)); std::string expected_output(cases[i].output); - ReplaceSubstringsAfterOffset(&expected_output, 0, "...", kEllipsis); + base::ReplaceSubstringsAfterOffset(&expected_output, 0, "...", kEllipsis); const std::string result = UTF16ToUTF8(JoinString(lines, '|')); EXPECT_EQ(expected_output, result) << "Case " << i << " failed!"; } diff --git a/ui/message_center/views/bounded_label_unittest.cc b/ui/message_center/views/bounded_label_unittest.cc index 9744aee..7c3a6a6 100644 --- a/ui/message_center/views/bounded_label_unittest.cc +++ b/ui/message_center/views/bounded_label_unittest.cc @@ -38,7 +38,7 @@ class BoundedLabelTest : public testing::Test { const char kPeriods[] = "..."; const char kEllipses[] = "\xE2\x80\xA6"; std::string result = string; - ReplaceSubstringsAfterOffset(&result, 0, kPeriods, kEllipses); + base::ReplaceSubstringsAfterOffset(&result, 0, kPeriods, kEllipses); return base::UTF8ToUTF16(result); } diff --git a/ui/views/controls/menu/native_menu_win.cc b/ui/views/controls/menu/native_menu_win.cc index c29e7b5..6ca0b30 100644 --- a/ui/views/controls/menu/native_menu_win.cc +++ b/ui/views/controls/menu/native_menu_win.cc @@ -692,7 +692,7 @@ void NativeMenuWin::UpdateMenuItemInfoForString(MENUITEMINFO* mii, ui::MenuModel::ItemType type = model_->GetTypeAt(model_index); // Strip out any tabs, otherwise they get interpreted as accelerators and can // lead to weird behavior. - ReplaceSubstringsAfterOffset(&formatted, 0, L"\t", L" "); + base::ReplaceSubstringsAfterOffset(&formatted, 0, L"\t", L" "); if (type != ui::MenuModel::TYPE_SUBMENU) { // Add accelerator details to the label if provided. ui::Accelerator accelerator(ui::VKEY_UNKNOWN, ui::EF_NONE); |