Index: content/browser/tab_contents/navigation_entry.h |
diff --git a/content/browser/tab_contents/navigation_entry.h b/content/browser/tab_contents/navigation_entry.h |
index 28ffa99a85448a8da55816d0ca01c0f64d6bf741..671cc5bf90660e8be200a5acc198800b8defa7d1 100644 |
--- a/content/browser/tab_contents/navigation_entry.h |
+++ b/content/browser/tab_contents/navigation_entry.h |
@@ -10,7 +10,6 @@ |
#include "base/basictypes.h" |
#include "base/memory/ref_counted.h" |
-#include "base/i18n/rtl.h" |
#include "chrome/common/security_style.h" |
#include "content/common/page_transition_types.h" |
#include "content/common/page_type.h" |
@@ -184,7 +183,7 @@ class NavigationEntry { |
int page_id, |
const GURL& url, |
const GURL& referrer, |
- const base::i18n::String16WithDirection& title, |
+ const string16& title, |
PageTransition::Type transition_type); |
~NavigationEntry(); |
@@ -227,7 +226,7 @@ class NavigationEntry { |
// the user. |
void set_url(const GURL& url) { |
url_ = url; |
- cached_display_title_ = base::i18n::String16WithDirection(); |
+ cached_display_title_.clear(); |
} |
const GURL& url() const { |
return url_; |
@@ -250,7 +249,7 @@ class NavigationEntry { |
// if there is no overridden display URL, it will return the actual one. |
void set_virtual_url(const GURL& url) { |
virtual_url_ = (url == url_) ? GURL() : url; |
- cached_display_title_ = base::i18n::String16WithDirection(); |
+ cached_display_title_.clear(); |
} |
bool has_virtual_url() const { |
return !virtual_url_.is_empty(); |
@@ -270,11 +269,11 @@ class NavigationEntry { |
// The caller is responsible for detecting when there is no title and |
// displaying the appropriate "Untitled" label if this is being displayed to |
// the user. |
- void set_title(const base::i18n::String16WithDirection& title) { |
+ void set_title(const string16& title) { |
title_ = title; |
- cached_display_title_ = base::i18n::String16WithDirection(); |
+ cached_display_title_.clear(); |
} |
- const base::i18n::String16WithDirection& title() const { |
+ const string16& title() const { |
return title_; |
} |
@@ -325,8 +324,7 @@ class NavigationEntry { |
// the page if it is available or the URL. |languages| is the list of |
// accpeted languages (e.g., prefs::kAcceptLanguages) or empty if proper |
// URL formatting isn't needed (e.g., unit tests). |
- const base::i18n::String16WithDirection& GetTitleForDisplay( |
- const std::string& languages); |
+ const string16& GetTitleForDisplay(const std::string& languages); |
// Returns true if the current tab is in view source mode. This will be false |
// if there is no navigation. |
@@ -409,7 +407,7 @@ class NavigationEntry { |
GURL referrer_; |
GURL virtual_url_; |
bool update_virtual_url_with_url_; |
- base::i18n::String16WithDirection title_; |
+ string16 title_; |
FaviconStatus favicon_; |
std::string content_state_; |
int32 page_id_; |
@@ -423,7 +421,7 @@ class NavigationEntry { |
// us from having to do URL formatting on the URL evey time the title is |
// displayed. When the URL, virtual URL, or title is set, this should be |
// cleared to force a refresh. |
- base::i18n::String16WithDirection cached_display_title_; |
+ string16 cached_display_title_; |
// Copy and assignment is explicitly allowed for this class. |
}; |