Relanding the language detection.

chrome/browser/tab_contents/tab_contents.h

Index: chrome/browser/tab_contents/tab_contents.h
===================================================================
--- chrome/browser/tab_contents/tab_contents.h	(revision 35721)
+++ chrome/browser/tab_contents/tab_contents.h	(working copy)
@@ -18,6 +18,7 @@
 #include "base/scoped_ptr.h"
 #include "chrome/browser/autocomplete/autocomplete_edit.h"
 #include "chrome/browser/cancelable_request.h"
+#include "chrome/browser/cld_helper.h"
 #include "chrome/browser/dom_ui/dom_ui_factory.h"
 #include "chrome/browser/download/save_package.h"
 #include "chrome/browser/fav_icon_helper.h"
@@ -288,6 +289,9 @@
   // to the foreground if necessary.
   void Activate();
 
+  // Called by CLDHelper to notify the language of a page has been detected.
+  void PageLanguageDetected();
+
   // TODO(brettw) document these.
   virtual void ShowContents();
   virtual void HideContents();
@@ -538,9 +542,6 @@
     return last_search_result_;
   }
 
-  // Get the most probable language of the text content in the tab.
-  void GetPageLanguage();
-
   // Misc state & callbacks ----------------------------------------------------
 
   // Set whether the contents should block javascript message boxes or not.
@@ -814,6 +815,10 @@
   virtual void OnDidGetApplicationInfo(
       int32 page_id,
       const webkit_glue::WebApplicationInfo& info);
+  virtual void OnPageContents(const GURL& url,
+                              int renderer_process_id,
+                              int32 page_id,
+                              const std::wstring& contents);
 
   // RenderViewHostDelegate::Resource implementation.
   virtual void DidStartProvisionalLoadForFrame(RenderViewHost* render_view_host,
@@ -1178,6 +1183,9 @@
   // profile
   scoped_refptr<URLRequestContextGetter> request_context_;
 
+  // Used to retrieve the language of the current page.
+  scoped_refptr<CLDHelper> cld_helper_;
+
   // ---------------------------------------------------------------------------
 
   DISALLOW_COPY_AND_ASSIGN(TabContents);