Relanding the language detection.

chrome/browser/tab_contents/tab_contents.h

 // 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.
 
 #ifndef CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 #define CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_
 
 #include "build/build_config.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "app/gfx/native_widget_types.h"
 #include "base/basictypes.h"
 #include "base/gfx/rect.h"
 #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"
 #include "chrome/browser/find_notification_details.h"
 #include "chrome/browser/jsmessage_box_client.h"
 #include "chrome/browser/net/url_request_context_getter.h"
 #include "chrome/browser/shell_dialogs.h"
 #include "chrome/browser/renderer_host/render_view_host_delegate.h"
 #include "chrome/browser/tab_contents/constrained_window.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
@@ skipping 250 matching lines @@
   virtual void DidBecomeSelected();
 
   // Invoked when the tab contents becomes hidden.
   // NOTE: If you override this, call the superclass version too!
   virtual void WasHidden();
 
   // Activates this contents within its containing window, bringing that window
   // 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();
 
   // Commands ------------------------------------------------------------------
 
   // Implementation of PageNavigator.
   virtual void OpenURL(const GURL& url, const GURL& referrer,
                        WindowOpenDisposition disposition,
                        PageTransition::Type transition);
@@ skipping 230 matching lines @@
   // string entered, whatever tab that search was performed in.
   string16 find_prepopulate_text() const {
     return *last_search_prepopulate_text_;
   }
 
   // Accessor for find_result_.
   const FindNotificationDetails& find_result() const {
     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.
   // Default is not to block any message boxes.
   void set_suppress_javascript_messages(bool suppress_javascript_messages) {
     suppress_javascript_messages_ = suppress_javascript_messages;
   }
 
   // Prepare for saving the current web page to disk.
   void OnSavePage();
@@ skipping 253 matching lines @@
                            bool final_update);
   virtual void GoToEntryAtOffset(int offset);
   virtual void GetHistoryListCount(int* back_list_count,
                                    int* forward_list_count);
   virtual void OnMissingPluginStatus(int status);
   virtual void OnCrashedPlugin(const FilePath& plugin_path);
   virtual void OnCrashedWorker();
   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,
                                                bool is_main_frame,
                                                const GURL& url);
   virtual void DidStartReceivingResourceResponse(
       ResourceRequestDetails* details);
   virtual void DidRedirectProvisionalLoad(int32 page_id,
                                           const GURL& source_url,
                                           const GURL& target_url);
@@ skipping 344 matching lines @@
   base::TimeTicks new_tab_start_time_;
 
   // The time that we started to close the tab.
   base::TimeTicks tab_close_start_time_;
 
   // Contextual information to be used for requests created here.
   // Can be NULL in which case we defer to the request context from the
   // 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);
 };
 
 #endif  // CHROME_BROWSER_TAB_CONTENTS_TAB_CONTENTS_H_