Fix strings in dialogs for chrome.fileSystem.requestFileSystem.

chrome/browser/extensions/api/file_system/request_file_system_dialog_view.cc

 // Copyright 2015 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/extensions/api/file_system/request_file_system_dialog_view.h"
 
 #include <cstdlib>
 
 #include "base/strings/utf_string_conversions.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 36 matching lines @@
 
 int RequestFileSystemDialogView::GetDefaultDialogButton() const {
   return ui::DIALOG_BUTTON_CANCEL;
 }
 
 base::string16 RequestFileSystemDialogView::GetDialogButtonLabel(
     ui::DialogButton button) const {
   switch (button) {
     case ui::DIALOG_BUTTON_OK:
       return l10n_util::GetStringUTF16(
-          IDS_FILE_SYSTEM_REQUEST_FILE_SYSTEM_DIALOG_YES_BUTTON);
+          IDS_FILE_SYSTEM_REQUEST_FILE_SYSTEM_DIALOG_ALLOW_BUTTON);
     case ui::DIALOG_BUTTON_CANCEL:
       return l10n_util::GetStringUTF16(
-          IDS_FILE_SYSTEM_REQUEST_FILE_SYSTEM_DIALOG_NO_BUTTON);
+          IDS_FILE_SYSTEM_REQUEST_FILE_SYSTEM_DIALOG_DENY_BUTTON);
     default:
       NOTREACHED();
   }
   return base::string16();
 }
 
 ui::ModalType RequestFileSystemDialogView::GetModalType() const {
   return ui::MODAL_TYPE_CHILD;
 }
 
@@ skipping 27 matching lines @@
     : callback_(callback), contents_view_(new views::View) {
   DCHECK(!callback_.is_null());
 
   // If the volume is gone, then cancel the dialog.
   if (!volume.get()) {
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE, base::Bind(callback, ui::DIALOG_BUTTON_CANCEL));
     return;
   }
 
+  const base::string16 app_name = base::UTF8ToUTF16(extension.name());
   // TODO(mtomasz): Improve the dialog contents, so it's easier for the user
   // to understand what device is being requested.
-  const base::string16 display_name =
+  const base::string16 volume_name =
       base::UTF8ToUTF16(!volume->volume_label().empty() ? volume->volume_label()
                                                         : volume->volume_id());
+  std::vector<size_t> placeholder_offsets;
   const base::string16 message = l10n_util::GetStringFUTF16(
       writable ? IDS_FILE_SYSTEM_REQUEST_FILE_SYSTEM_DIALOG_WRITABLE_MESSAGE
                : IDS_FILE_SYSTEM_REQUEST_FILE_SYSTEM_DIALOG_MESSAGE,
-      display_name);
-
-  // Find location of the placeholder by comparing message and message_host
-  // strings in order to apply the bold style on the display name.
-  const base::string16 message_host = l10n_util::GetStringFUTF16(
-      writable ? IDS_FILE_SYSTEM_REQUEST_FILE_SYSTEM_DIALOG_WRITABLE_MESSAGE
-               : IDS_FILE_SYSTEM_REQUEST_FILE_SYSTEM_DIALOG_MESSAGE,
-      base::string16());
-
-  size_t placeholder_start = 0;
-  while (placeholder_start < message.size() &&
-         message[placeholder_start] == message_host[placeholder_start]) {
-    ++placeholder_start;
-  }
+      app_name, volume_name, &placeholder_offsets);
 
   views::StyledLabel* const label = new views::StyledLabel(message, nullptr);
   views::StyledLabel::RangeStyleInfo bold_style;
   bold_style.font_style = gfx::Font::BOLD;
 
+  DCHECK_EQ(2u, placeholder_offsets.size());
+  label->AddStyleRange(gfx::Range(placeholder_offsets[0],
+                                  placeholder_offsets[0] + app_name.length()),
+                       bold_style);
   label->AddStyleRange(
-      gfx::Range(placeholder_start, placeholder_start + display_name.size()),
+      gfx::Range(placeholder_offsets[1],
+                 placeholder_offsets[1] + volume_name.length()),
       bold_style);
 
   views::BoxLayout* const layout = new views::BoxLayout(
       views::BoxLayout::kHorizontal, views::kButtonHEdgeMarginNew,
       views::kPanelVertMargin, 0);
   contents_view_->SetLayoutManager(layout);
 
   label->SizeToFit(kDialogMaxWidth - 2 * views::kButtonHEdgeMarginNew);
   contents_view_->AddChildView(label);
 }