Revert 35735 - Relanding the language detection code....

chrome/browser/tab_contents/tab_contents.cc

 // Copyright (c) 2009 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/tab_contents/tab_contents.h"
 
 #include "app/gfx/text_elider.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/file_version_info.h"
@@ skipping 351 matching lines @@
   // NULL if this contents was part of a window that closed.
   if (GetNativeView())
     ::DestroyWindow(GetNativeView());
 #endif
 
   // OnCloseStarted isn't called in unit tests.
   if (!tab_close_start_time_.is_null()) {
     UMA_HISTOGRAM_TIMES("Tab.Close",
         base::TimeTicks::Now() - tab_close_start_time_);
   }
-
-  if (cld_helper_.get())
-    cld_helper_->CancelLanguageDetection();
 }
 
 // static
 void TabContents::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterBooleanPref(prefs::kAlternateErrorPagesEnabled, true);
 
   WebPreferences pref_defaults;
   prefs->RegisterBooleanPref(prefs::kWebKitJavascriptEnabled,
                              pref_defaults.javascript_enabled);
   prefs->RegisterBooleanPref(prefs::kWebKitWebSecurityEnabled,
@@ skipping 248 matching lines @@
       NotificationType::TAB_CONTENTS_HIDDEN,
       Source<TabContents>(this),
       NotificationService::NoDetails());
 }
 
 void TabContents::Activate() {
   if (delegate_)
     delegate_->ActivateContents(this);
 }
 
-void TabContents::PageLanguageDetected() {
-  DCHECK(cld_helper_.get());
-
-  NavigationEntry* entry = controller_.GetActiveEntry();
-  if (process()->id() == cld_helper_->renderer_process_id() &&
-      entry && entry->page_id() == cld_helper_->page_id()) {
-    entry->set_language(cld_helper_->language());
-  }
-
-  std::string lang = cld_helper_->language();
-  NotificationService::current()->Notify(
-      NotificationType::TAB_LANGUAGE_DETERMINED,
-      Source<RenderViewHost>(render_view_host()),
-      Details<std::string>(&lang));
-
-  cld_helper_ = NULL;  // Release the CLD helper.
-}
-
 void TabContents::ShowContents() {
   if (render_widget_host_view())
     render_widget_host_view()->DidBecomeSelected();
 }
 
 void TabContents::HideContents() {
   // TODO(pkasting): http://b/1239839  Right now we purposefully don't call
   // our superclass HideContents(), because some callers want to be very picky
   // about the order in which these get called.  In addition to making the code
   // here practically impossible to understand, this also means we end up
@@ skipping 419 matching lines @@
   // by the user, but the UI has not been dismissed.
   if (!clear_selection)
     find_ui_active_ = false;
   previous_find_text_ = find_text_;
   find_text_.clear();
   find_op_aborted_ = true;
   last_search_result_ = FindNotificationDetails();
   render_view_host()->StopFinding(clear_selection);
 }
 
+void TabContents::GetPageLanguage() {
+  render_view_host()->GetPageLanguage();
+}
+
 void TabContents::OnSavePage() {
   // If we can not save the page, try to download it.
   if (!SavePackage::IsSavableContents(contents_mime_type())) {
     DownloadManager* dlm = profile()->GetDownloadManager();
     const GURL& current_page_url = GetURL();
     if (dlm && current_page_url.is_valid())
       dlm->DownloadUrl(current_page_url, GURL(), "", this);
     return;
   }
 
@@ skipping 635 matching lines @@
 
 void TabContents::OnDidGetApplicationInfo(
     int32 page_id,
     const webkit_glue::WebApplicationInfo& info) {
   web_app_info_ = info;
 
   if (delegate())
     delegate()->OnDidGetApplicationInfo(this, page_id);
 }
 
-void TabContents::OnPageContents(const GURL& url,
-                                 int renderer_process_id,
-                                 int32 page_id,
-                                 const std::wstring& contents) {
-  // Don't index any https pages. People generally don't want their bank
-  // accounts, etc. indexed on their computer, especially since some of these
-  // things are not marked cachable.
-  // TODO(brettw) we may want to consider more elaborate heuristics such as
-  // the cachability of the page. We may also want to consider subframes (this
-  // test will still index subframes if the subframe is SSL).
-  if (!url.SchemeIsSecure()) {
-    Profile* p = profile();
-    if (p && !p->IsOffTheRecord()) {
-      HistoryService* hs = p->GetHistoryService(Profile::IMPLICIT_ACCESS);
-      if (hs)
-        hs->SetPageContents(url, contents);
-    }
-  }
-
-  // Detect the page language.  The detection happens on the file thread.
-  // PageLanguageDetected() is called when the language has been detected.
-  if (cld_helper_.get()) {
-    // There is already a language detection in flight, cancel it to avoid
-    // having multiple PageLanguageDetected() notifications on this tab. (They
-    // would cause a crasher as cld_helper_ would be NULLed on the 1st
-    // notification).
-    cld_helper_->CancelLanguageDetection();
-  }
-  cld_helper_ = new CLDHelper(this, renderer_process_id, page_id, contents);
-  cld_helper_->DetectLanguage();
-}
-
 void TabContents::DidStartProvisionalLoadForFrame(
     RenderViewHost* render_view_host,
     bool is_main_frame,
     const GURL& url) {
   ProvisionalLoadDetails details(is_main_frame,
                                  controller_.IsURLInPageNavigation(url),
                                  url, std::string(), false);
   NotificationService::current()->Notify(
       NotificationType::FRAME_PROVISIONAL_LOAD_START,
       Source<NavigationController>(&controller_),
@@ skipping 903 matching lines @@
   render_view_host()->JavaScriptMessageBoxClosed(reply_msg, success, prompt);
 }
 
 void TabContents::SetSuppressMessageBoxes(bool suppress_message_boxes) {
   set_suppress_javascript_messages(suppress_message_boxes);
 }
 
 void TabContents::set_encoding(const std::string& encoding) {
   encoding_ = CharacterEncoding::GetCanonicalEncodingNameByAliasName(encoding);
 }