Shows Unicode IDN instead of Punycode in the followings:

 - Bookmark Manager
 - Edit Bookmark dialog opened by Bookmark Manager
 - Edit Bookmark dialog opened by the star on the left of the address bar

Introduces new function, net::FormatUrl(), which has the following
parameters in addition to gfx::GetCleanStringFromUrl().
 - bool omit_username_password
 - bool unescape
and moves gfx::GetClienStringFromUrl() to net:: namespace, and removed
the last two parameters.

BUG=3991
Checked in for tkent
Original review = http://codereview.chromium.org/115346

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16761 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 5 deletions

diff --git a/chrome/browser/tab_contents/navigation_entry.cc b/chrome/browser/tab_contents/navigation_entry.cc
index 655a998..b2235bc 100644
--- a/chrome/browser/tab_contents/navigation_entry.cc
+++ b/chrome/browser/tab_contents/navigation_entry.cc
@@ -4,13 +4,13 @@
 
 #include "chrome/browser/tab_contents/navigation_entry.h"
 
-#include "app/gfx/text_elider.h"
 #include "app/resource_bundle.h"
 #include "chrome/browser/tab_contents/navigation_controller.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/url_constants.h"
 #include "grit/app_resources.h"
+#include "net/base/net_util.h"
 
 // Use this to get a new unique ID for a NavigationEntry during construction.
 // The returned ID is guaranteed to be nonzero (which is the "no ID" indicator).
@@ -80,11 +80,10 @@ const string16& NavigationEntry::GetTitleForDisplay(
           prefs::kAcceptLanguages);
   }
   if (!display_url_.is_empty()) {
-    cached_display_title_ = WideToUTF16Hack(gfx::GetCleanStringFromUrl(
-        display_url_, languages, NULL, NULL));
+    cached_display_title_ = WideToUTF16Hack(net::FormatUrl(
+        display_url_, languages));
   } else if (!url_.is_empty()) {
-    cached_display_title_ = WideToUTF16Hack(gfx::GetCleanStringFromUrl(
-        url_, languages, NULL, NULL));
+    cached_display_title_ = WideToUTF16Hack(net::FormatUrl(url_, languages));
   }
   return cached_display_title_;
 }