Move LanguageState to the translate component

chrome/browser/translate/translate_tab_helper.h

Index: chrome/browser/translate/translate_tab_helper.h
diff --git a/chrome/browser/translate/translate_tab_helper.h b/chrome/browser/translate/translate_tab_helper.h
index 8378770d13d94401b3116a159d550b37478a0154..fc9129b9044f45e8b7cc9e94e99936a53bea10e9 100644
--- a/chrome/browser/translate/translate_tab_helper.h
+++ b/chrome/browser/translate/translate_tab_helper.h
@@ -1,11 +1,11 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2011 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_TRANSLATE_TRANSLATE_TAB_HELPER_H_
 #define CHROME_BROWSER_TRANSLATE_TRANSLATE_TAB_HELPER_H_
 
-#include "chrome/browser/tab_contents/language_state.h"
+#include "components/translate/content/browser/content_translate_driver.h"
 #include "components/translate/core/common/translate_errors.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
@@ -18,7 +18,12 @@ class TranslateTabHelper
  public:
   virtual ~TranslateTabHelper();
 
-  LanguageState& language_state() { return language_state_; }
+  // Gets the LanguageState associated with the page.
+  // Information about the language the page is in and has been translated to.

[blundell, 2014/01/17 16:37:36]

This comment reads oddly.

[droger, 2014/01/20 10:37:06]

This line was in the original code (line 40 on the left).
Removed.

+  LanguageState& GetLanguageState();
+
+  // Returns the content driver for translate.
+  ContentTranslateDriver* GetTranslateDriver();

[blundell, 2014/01/17 16:37:36]

I assume that TranslateTabHelper will get merged with TranslateDelegateImpl in
the medium-term?

[droger, 2014/01/20 10:37:06]

If all goes well yes.
I still need to sort out the ownership issues in TranslateManager before being
100% sure, and that's what I'll do next.

 
  private:
   explicit TranslateTabHelper(content::WebContents* web_contents);
@@ -37,8 +42,7 @@ class TranslateTabHelper
                         const std::string& translated_lang,
                         TranslateErrors::Type error_type);
 
-  // Information about the language the page is in and has been translated to.
-  LanguageState language_state_;
+  ContentTranslateDriver translate_driver_;
 
   DISALLOW_COPY_AND_ASSIGN(TranslateTabHelper);
 };