LanguageState should be owned by TranslateManager

components/translate/content/browser/content_translate_driver.cc

 // Copyright 2014 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 "components/translate/content/browser/content_translate_driver.h"
 
 #include "base/logging.h"
 #include "components/translate/content/common/translate_messages.h"
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"

[droger, 2014/05/20 07:43:07]

Maybe you can remove this include.

[nshaik, 2014/05/20 22:33:53]

Done.

 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "url/gurl.h"
 
 ContentTranslateDriver::ContentTranslateDriver(
     content::NavigationController* nav_controller)
     : navigation_controller_(nav_controller),
-      language_state_(this),
       observer_(NULL) {
   DCHECK(navigation_controller_);
 }
 
 ContentTranslateDriver::~ContentTranslateDriver() {}
 
-void ContentTranslateDriver::DidNavigate(
-    const content::LoadCommittedDetails& details) {
-  const bool reload =
-      details.entry->GetTransitionType() == content::PAGE_TRANSITION_RELOAD ||
-      details.type == content::NAVIGATION_TYPE_SAME_PAGE;
-  language_state_.DidNavigate(
-      details.is_in_page, details.is_main_frame, reload);
-}
-
 // TranslateDriver methods
 
 bool ContentTranslateDriver::IsLinkNavigation() {
   return navigation_controller_ && navigation_controller_->GetActiveEntry() &&
          navigation_controller_->GetActiveEntry()->GetTransitionType() ==
              content::PAGE_TRANSITION_LINK;
 }
 
 void ContentTranslateDriver::OnTranslateEnabledChanged() {
   if (observer_) {
     content::WebContents* web_contents =
         navigation_controller_->GetWebContents();
     observer_->OnTranslateEnabledChanged(web_contents);
   }
 }
 
 void ContentTranslateDriver::OnIsPageTranslatedChanged() {
   if (observer_) {
     content::WebContents* web_contents =
         navigation_controller_->GetWebContents();
     observer_->OnIsPageTranslatedChanged(web_contents);
   }
 }
 
-LanguageState& ContentTranslateDriver::GetLanguageState() {
-  return language_state_;
-}
-
 void ContentTranslateDriver::TranslatePage(const std::string& translate_script,
                                            const std::string& source_lang,
                                            const std::string& target_lang) {
   content::NavigationEntry* entry = navigation_controller_->GetActiveEntry();
   if (!entry) {
     NOTREACHED();
     return;
   }
 
   content::WebContents* web_contents = navigation_controller_->GetWebContents();
@@ skipping 42 matching lines @@
 
 bool ContentTranslateDriver::HasCurrentPage() {
   return (navigation_controller_->GetActiveEntry() != NULL);
 }
 
 int ContentTranslateDriver::GetCurrentPageID() {
   DCHECK(HasCurrentPage());
   content::NavigationEntry* entry = navigation_controller_->GetActiveEntry();
   return entry->GetPageID();
 }