summaryrefslogtreecommitdiffstats
path: root/chrome/browser/tab_contents/navigation_entry.h
diff options
context:
space:
mode:
authorjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-07 23:25:52 +0000
committerjcampan@chromium.org <jcampan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-01-07 23:25:52 +0000
commit7893a989c3e8cfa8f9cc25547025d541c1205ef4 (patch)
tree2ae568e48c773ec1c1bf614ca5ba326f9327d0d7 /chrome/browser/tab_contents/navigation_entry.h
parent59a10b95b43a0b78ec3153ed21f2b1181a4a947e (diff)
downloadchromium_src-7893a989c3e8cfa8f9cc25547025d541c1205ef4.zip
chromium_src-7893a989c3e8cfa8f9cc25547025d541c1205ef4.tar.gz
chromium_src-7893a989c3e8cfa8f9cc25547025d541c1205ef4.tar.bz2
Revert 35735 - Relanding the language detection code.
Still causes redness on the reliability bot. The code would crash if multiple PageContents notifications were received rapidly. The CLDHelper now notifies the TabContents directly and the TabContents ensures only one language detection can be performed at a time. Added unittests to validate these cases in web_contents_unittest.cc. Note that patch set 1 is the original patch, patch set 2 contains the new changes. Original review: http://codereview.chromium.org/492024/show BUG=30662 TEST=Run the unittests. Review URL: http://codereview.chromium.org/504051 TBR=jcampan@chromium.org Review URL: http://codereview.chromium.org/523149 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35753 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents/navigation_entry.h')
-rw-r--r--chrome/browser/tab_contents/navigation_entry.h10
1 files changed, 0 insertions, 10 deletions
diff --git a/chrome/browser/tab_contents/navigation_entry.h b/chrome/browser/tab_contents/navigation_entry.h
index df6ad06..e679c10 100644
--- a/chrome/browser/tab_contents/navigation_entry.h
+++ b/chrome/browser/tab_contents/navigation_entry.h
@@ -389,15 +389,6 @@ class NavigationEntry {
return restore_type_;
}
- // The ISO 639-1 language code (ex: en, fr, zh...) for the page.
- // Can be empty if the language was not detected yet or is unknown.
- void set_language(const std::string& language) {
- language_ = language;
- }
- std::string language() const {
- return language_;
- }
-
private:
// WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING WARNING
// Session/Tab restore save portions of this class so that it can be recreated
@@ -422,7 +413,6 @@ class NavigationEntry {
GURL user_typed_url_;
bool has_post_data_;
RestoreType restore_type_;
- std::string language_; // ISO 639-1 language code.
// This is a cached version of the result of GetTitleForDisplay. It prevents
// us from having to do URL formatting on the URL evey time the title is