Remove "BUBBLE" from chooser related string IDs

chrome/browser/ui/views/chooser_content_view.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/chooser_content_view.h"
 
 #include "chrome/grit/generated_resources.h"
 #include "components/chooser_controller/chooser_controller.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/table_model.h"
@@ skipping 50 matching lines @@
   return std::max(static_cast<int>(chooser_controller_->NumOptions()), 1);
 }
 
 base::string16 ChooserTableModel::GetText(int row, int column_id) {
   if (!chooser_controller_)
     return base::string16();
 
   int num_options = static_cast<int>(chooser_controller_->NumOptions());
   if (num_options == 0) {
     DCHECK_EQ(0, row);
-    return l10n_util::GetStringUTF16(
-        IDS_CHOOSER_BUBBLE_NO_DEVICES_FOUND_PROMPT);
+    return l10n_util::GetStringUTF16(IDS_CHOOSER_NO_DEVICES_FOUND_PROMPT);
   }
 
   DCHECK_GE(row, 0);
   DCHECK_LT(row, num_options);
   return chooser_controller_->GetOption(static_cast<size_t>(row));
 }
 
 void ChooserTableModel::SetObserver(ui::TableModelObserver* observer) {
   observer_ = observer;
 }
@@ skipping 63 matching lines @@
   chooser_table_model_->SetObserver(nullptr);
 }
 
 gfx::Size ChooserContentView::GetPreferredSize() const {
   return gfx::Size(kChooserWidth, kChooserHeight);
 }
 
 base::string16 ChooserContentView::GetDialogButtonLabel(
     ui::DialogButton button) const {
   return l10n_util::GetStringUTF16(button == ui::DIALOG_BUTTON_OK
-                                       ? IDS_CHOOSER_BUBBLE_CONNECT_BUTTON_TEXT
-                                       : IDS_CHOOSER_BUBBLE_CANCEL_BUTTON_TEXT);
+                                       ? IDS_CHOOSER_CONNECT_BUTTON_TEXT
+                                       : IDS_CHOOSER_CANCEL_BUTTON_TEXT);
 }
 
 bool ChooserContentView::IsDialogButtonEnabled(ui::DialogButton button) const {
   return button != ui::DIALOG_BUTTON_OK ||
          !table_view_->selection_model().empty();
 }
 
 views::StyledLabel* ChooserContentView::CreateFootnoteView(
     views::StyledLabelListener* listener) const {
   base::string16 link =
-      l10n_util::GetStringUTF16(IDS_CHOOSER_BUBBLE_GET_HELP_LINK_TEXT);
+      l10n_util::GetStringUTF16(IDS_CHOOSER_GET_HELP_LINK_TEXT);
   size_t offset = 0;
-  base::string16 text = l10n_util::GetStringFUTF16(
-      IDS_CHOOSER_BUBBLE_FOOTNOTE_TEXT, link, &offset);
+  base::string16 text =
+      l10n_util::GetStringFUTF16(IDS_CHOOSER_FOOTNOTE_TEXT, link, &offset);
   views::StyledLabel* styled_label = new views::StyledLabel(text, listener);
   styled_label->AddStyleRange(
       gfx::Range(offset, offset + link.length()),
       views::StyledLabel::RangeStyleInfo::CreateForLink());
   return styled_label;
 }
 
 void ChooserContentView::Accept() {
   if (chooser_controller_) {
     chooser_controller_->Select(table_view_->selection_model().active());
@@ skipping 21 matching lines @@
 }
 
 void ChooserContentView::UpdateTableModel() {
   chooser_table_model_->Update();
 }
 
 void ChooserContentView::ChooserControllerDestroying() {
   chooser_controller_ = nullptr;
   chooser_table_model_->ChooserControllerDestroying();
 }