diff options
Diffstat (limited to 'chrome/browser/ui')
8 files changed, 13 insertions, 13 deletions
diff --git a/chrome/browser/ui/app_list/search/term_break_iterator.cc b/chrome/browser/ui/app_list/search/term_break_iterator.cc index 5c7d44d..5ace7dc 100644 --- a/chrome/browser/ui/app_list/search/term_break_iterator.cc +++ b/chrome/browser/ui/app_list/search/term_break_iterator.cc @@ -53,7 +53,7 @@ const base::string16 TermBreakIterator::GetCurrentTerm() const { return word_.substr(prev_, pos_ - prev_); } -TermBreakIterator::State TermBreakIterator::GetNewState(char16 ch) { +TermBreakIterator::State TermBreakIterator::GetNewState(base::char16 ch) { if (IsAsciiDigit(ch) || ch == '.' || ch == ',') return STATE_NUMBER; diff --git a/chrome/browser/ui/app_list/search/term_break_iterator.h b/chrome/browser/ui/app_list/search/term_break_iterator.h index 3a88cf9..6ff877e 100644 --- a/chrome/browser/ui/app_list/search/term_break_iterator.h +++ b/chrome/browser/ui/app_list/search/term_break_iterator.h @@ -52,7 +52,7 @@ class TermBreakIterator { }; // Returns new state for given |ch|. - State GetNewState(char16 ch); + State GetNewState(base::char16 ch); const base::string16& word_; size_t prev_; diff --git a/chrome/browser/ui/gtk/gtk_util.cc b/chrome/browser/ui/gtk/gtk_util.cc index ebebb46e..c267fa5 100644 --- a/chrome/browser/ui/gtk/gtk_util.cc +++ b/chrome/browser/ui/gtk/gtk_util.cc @@ -946,7 +946,7 @@ base::string16 GetStockPreferencesMenuLabel() { GtkStockItem stock_item; base::string16 preferences; if (gtk_stock_lookup(GTK_STOCK_PREFERENCES, &stock_item)) { - const char16 kUnderscore[] = { '_', 0 }; + const base::char16 kUnderscore[] = { '_', 0 }; base::RemoveChars(base::UTF8ToUTF16(stock_item.label), kUnderscore, &preferences); } diff --git a/chrome/browser/ui/omnibox/omnibox_edit_model.cc b/chrome/browser/ui/omnibox/omnibox_edit_model.cc index 3241c50..0ddffb7 100644 --- a/chrome/browser/ui/omnibox/omnibox_edit_model.cc +++ b/chrome/browser/ui/omnibox/omnibox_edit_model.cc @@ -1282,7 +1282,7 @@ base::string16 OmniboxEditModel::DisplayTextFromUserText( base::string16 OmniboxEditModel::UserTextFromDisplayText( const base::string16& text) const { - return KeywordIsSelected() ? (keyword_ + char16(' ') + text) : text; + return KeywordIsSelected() ? (keyword_ + base::char16(' ') + text) : text; } void OmniboxEditModel::GetInfoForCurrentText(AutocompleteMatch* match, diff --git a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc index df41d7b..4128dd1 100644 --- a/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc +++ b/chrome/browser/ui/omnibox/omnibox_view_browsertest.cc @@ -782,7 +782,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_BasicTextOperations) { // Insert one character at the end. Make sure we won't insert // anything after the special ZWS mark used in gtk implementation. ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_A, 0)); - EXPECT_EQ(old_text + char16('a'), omnibox_view->GetText()); + EXPECT_EQ(old_text + base::char16('a'), omnibox_view->GetText()); // Delete one character from the end. Make sure we won't delete the special // ZWS mark used in gtk implementation. @@ -860,7 +860,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_AcceptKeywordBySpace) { // Keyword shouldn't be accepted by pressing space with a trailing // whitespace. - omnibox_view->SetWindowTextAndCaretPos(search_keyword + char16(' '), + omnibox_view->SetWindowTextAndCaretPos(search_keyword + base::char16(' '), search_keyword.length() + 1, false, false); ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_SPACE, 0)); ASSERT_TRUE(omnibox_view->model()->is_keyword_hint()); @@ -871,7 +871,7 @@ IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_AcceptKeywordBySpace) { ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_BACK, 0)); ASSERT_TRUE(omnibox_view->model()->is_keyword_hint()); ASSERT_EQ(search_keyword, omnibox_view->model()->keyword()); - ASSERT_EQ(search_keyword + char16(' '), omnibox_view->GetText()); + ASSERT_EQ(search_keyword + base::char16(' '), omnibox_view->GetText()); // Keyword shouldn't be accepted by pressing space before a trailing space. ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_LEFT, 0)); diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc index ee6ca0e..0658bb5 100644 --- a/chrome/browser/ui/views/download/download_item_view.cc +++ b/chrome/browser/ui/views/download/download_item_view.cc @@ -1243,11 +1243,11 @@ void DownloadItemView::SizeLabelToMinWidth() { // This can be a low surrogate codepoint, but u_isUWhiteSpace will // return false and inserting a new line after a surrogate pair // is perfectly ok. - char16 line_end_char = current_text[pos - 1]; + base::char16 line_end_char = current_text[pos - 1]; if (u_isUWhiteSpace(line_end_char)) - current_text.replace(pos - 1, 1, 1, char16('\n')); + current_text.replace(pos - 1, 1, 1, base::char16('\n')); else - current_text.insert(pos, 1, char16('\n')); + current_text.insert(pos, 1, base::char16('\n')); dangerous_download_label_->SetText(current_text); size = dangerous_download_label_->GetPreferredSize(); @@ -1286,7 +1286,7 @@ void DownloadItemView::UpdateAccessibleName() { if (IsShowingWarningDialog()) { new_name = dangerous_download_label_->text(); } else { - new_name = status_text_ + char16(' ') + + new_name = status_text_ + base::char16(' ') + download()->GetFileNameToReportUser().LossyDisplayName(); } diff --git a/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc b/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc index f8260b5..3e940a9 100644 --- a/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc +++ b/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc @@ -241,7 +241,7 @@ void ExtensionMessageBubbleView::Init() { extensions->SetHorizontalAlignment(gfx::ALIGN_LEFT); std::vector<base::string16> extension_list; - char16 bullet_point = 0x2022; + base::char16 bullet_point = 0x2022; std::vector<base::string16> suspicious = delegate_->GetExtensions(); size_t i = 0; diff --git a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc index 6a571a5..3d5defb 100644 --- a/chrome/browser/ui/views/omnibox/omnibox_result_view.cc +++ b/chrome/browser/ui/views/omnibox/omnibox_result_view.cc @@ -40,7 +40,7 @@ namespace { -const char16 kEllipsis[] = { 0x2026, 0x0 }; +const base::char16 kEllipsis[] = { 0x2026, 0x0 }; // The minimum distance between the top and bottom of the {icon|text} and the // top or bottom of the row. |