Make 'dangerous download warning' visible in Japanese UI on Windows.

chrome/browser/ui/views/download_item_view.cc

 // Copyright (c) 2011 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/download_item_view.h"
 
 #include <vector>
 
 #include "base/callback.h"
 #include "base/file_path.h"
+#include "base/i18n/break_iterator.h"
 #include "base/i18n/rtl.h"
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/ui/views/download_shelf_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/text/text_elider.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/image.h"
+#include "unicode/uchar.h"
 #include "views/controls/button/native_button.h"
 #include "views/controls/menu/menu_2.h"
 #include "views/widget/root_view.h"
 #include "views/widget/widget.h"
 
 using base::TimeDelta;
 
 // TODO(paulg): These may need to be adjusted when download progress
 //              animation is added, and also possibly to take into account
 //              different screen resolutions.
@@ skipping 999 matching lines @@
   std::wstring text = dangerous_download_label_->GetText();
   TrimWhitespace(text, TRIM_ALL, &text);
   DCHECK_EQ(std::wstring::npos, text.find(L"\n"));
 
   // Make the label big so that GetPreferredSize() is not constrained by the
   // current width.
   dangerous_download_label_->SetBounds(0, 0, 1000, 1000);
 
   gfx::Size size;
   int min_width = -1;
-  size_t sp_index = text.find(L" ");
-  while (sp_index != std::wstring::npos) {
-    text.replace(sp_index, 1, L"\n");
-    dangerous_download_label_->SetText(text);
+  string16 text16 = WideToUTF16(text);
+  // Using BREAK_WORD can work in most cases, but it can also break
+  // lines where it should not. Using BREAK_LINE is safer although
+  // slower for Chinese/Japanese. This is not perf-critical at all, though.
+  base::BreakIterator iter(&text16, base::BreakIterator::BREAK_LINE);
+  bool status = iter.Init();
+  DCHECK(status);
+
+  string16 current_text = text16;
+  string16 prev_text = text16;
+  while (iter.Advance()) {
+    size_t pos = iter.pos();
+    if (pos >= text16.length())
+      break;
+    // 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 = text16[pos - 1];
+    if (u_isUWhiteSpace(line_end_char))
+      current_text.replace(pos - 1, 1, 1, char16('\n'));
+    else
+      current_text.insert(pos, 1, char16('\n'));
+    dangerous_download_label_->SetText(UTF16ToWide(current_text));
     size = dangerous_download_label_->GetPreferredSize();
 
     if (min_width == -1)
       min_width = size.width();
 
     // If the width is growing again, it means we passed the optimal width spot.
-    if (size.width() > min_width)
+    if (size.width() > min_width) {
+      dangerous_download_label_->SetText(UTF16ToWide(prev_text));
       break;
-    else
+    } else {
       min_width = size.width();
+    }
 
     // Restore the string.
-    text.replace(sp_index, 1, L" ");
-
-    sp_index = text.find(L" ", sp_index + 1);
+    prev_text = current_text;
+    current_text = text16;
   }
 
-  // If we have a line with no space, we won't cut it.
+  // If we have a line with no line breaking opportunity (which is very
+  // unlikely), we won't cut it.
   if (min_width == -1)
     size = dangerous_download_label_->GetPreferredSize();
 
   dangerous_download_label_->SetBounds(0, 0, size.width(), size.height());
   dangerous_download_label_sized_ = true;
 }
 
 void DownloadItemView::Reenable() {
   disabled_while_opening_ = false;
   SetEnabled(true);  // Triggers a repaint.
@@ skipping 17 matching lines @@
   // If the name has changed, notify assistive technology that the name
   // has changed so they can announce it immediately.
   if (new_name != accessible_name_) {
     accessible_name_ = new_name;
     if (GetWidget()) {
       GetWidget()->NotifyAccessibilityEvent(
           this, ui::AccessibilityTypes::EVENT_NAME_CHANGED, true);
     }
   }
 }