Move navigation handling code from TranslateClient to TranslateDriver

components/translate/content/browser/content_translate_driver.h

Index: components/translate/content/browser/content_translate_driver.h
diff --git a/components/translate/content/browser/content_translate_driver.h b/components/translate/content/browser/content_translate_driver.h
index bae58bb0962220c0d80484b1f3a9a66c59712a8c..bfef1b5c4ff1ebb65d9bd0b5b78907344d9e025a 100644
--- a/components/translate/content/browser/content_translate_driver.h
+++ b/components/translate/content/browser/content_translate_driver.h
@@ -6,7 +6,9 @@
 #define COMPONENTS_TRANSLATE_CONTENT_BROWSER_CONTENT_TRANSLATE_DRIVER_H_
 
 #include "base/basictypes.h"
+#include "base/memory/weak_ptr.h"
 #include "components/translate/core/browser/translate_driver.h"
+#include "content/public/browser/web_contents_observer.h"
 
 namespace content {
 class NavigationController;
@@ -15,8 +17,11 @@ class WebContents;
 
 namespace translate {
 
+class TranslateManager;
+
 // Content implementation of TranslateDriver.
-class ContentTranslateDriver : public TranslateDriver {
+class ContentTranslateDriver : public TranslateDriver,
+                               public content::WebContentsObserver {
  public:
 
   // The observer for the ContentTranslateDriver.
@@ -38,6 +43,18 @@ class ContentTranslateDriver : public TranslateDriver {
   // Sets the Observer. Calling this method is optional.
   void set_observer(Observer* observer) { observer_ = observer; }
 
+  // Number of attempts before waiting for a page to be fully reloaded.
+  void set_translate_max_reload_attempts(int attempts) {
+    max_reload_check_attempts_ = attempts;
+  }
+
+  void set_translate_manager(TranslateManager* manager) {

[Andrew Hayden (chromium.org), 2014/09/10 09:19:52]

For consistency with other public methods, this should have a documentation
comment.

[droger, 2014/09/10 09:58:47]

Done.

+    translate_manager_ = manager;
+  }
+
+  // Initiates translation once the page is finished loading.
+  void InitiateTranslation(const std::string& page_lang, int attempt);
+
   // TranslateDriver methods.
   virtual void OnIsPageTranslatedChanged() OVERRIDE;
   virtual void OnTranslateEnabledChanged() OVERRIDE;
@@ -55,12 +72,26 @@ class ContentTranslateDriver : public TranslateDriver {
   virtual bool HasCurrentPage() OVERRIDE;
   virtual void OpenUrlInNewTab(const GURL& url) OVERRIDE;
 
+  // content::WebContentsObserver implementation.
+  virtual void NavigationEntryCommitted(
+      const content::LoadCommittedDetails& load_details) OVERRIDE;
+  virtual void DidNavigateAnyFrame(
+      const content::LoadCommittedDetails& details,
+      const content::FrameNavigateParams& params) OVERRIDE;
+
  private:
   // The navigation controller of the tab we are associated with.
   content::NavigationController* navigation_controller_;
 
+  TranslateManager* translate_manager_;
+
   Observer* observer_;
 
+  // Max number of attempts before checking if a page has been reloaded.
+  int max_reload_check_attempts_;
+
+  base::WeakPtrFactory<ContentTranslateDriver> weak_pointer_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(ContentTranslateDriver);
 };