Revert 272217 "LanguageState should be owned by TranslateManager"

trunk/src/chrome/browser/translate/translate_tab_helper.cc

 // 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.
 
 #include "chrome/browser/translate/translate_tab_helper.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_split.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/translate/translate_accept_languages_factory.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "chrome/browser/translate/translate_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/translate/translate_bubble_factory.h"
 #include "chrome/common/pref_names.h"
 #include "components/translate/content/common/translate_messages.h"
-#include "components/translate/core/browser/language_state.h"
 #include "components/translate/core/browser/page_translated_details.h"
 #include "components/translate/core/browser/translate_accept_languages.h"
 #include "components/translate/core/browser/translate_download_manager.h"
 #include "components/translate/core/browser/translate_manager.h"
 #include "components/translate/core/browser/translate_prefs.h"
 #include "components/translate/core/common/language_detection_details.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_view_host.h"
@@ skipping 37 matching lines @@
     : content::WebContentsObserver(web_contents),
       max_reload_check_attempts_(kMaxTranslateLoadCheckAttempts),
       translate_driver_(&web_contents->GetController()),
       translate_manager_(new TranslateManager(this, prefs::kAcceptLanguages)),
       weak_pointer_factory_(this) {}
 
 TranslateTabHelper::~TranslateTabHelper() {
 }
 
 LanguageState& TranslateTabHelper::GetLanguageState() {
-  return translate_manager_->GetLanguageState();
+  return translate_driver_.GetLanguageState();
 }
 
 // static
 scoped_ptr<TranslatePrefs> TranslateTabHelper::CreateTranslatePrefs(
     PrefService* prefs) {
 #if defined(OS_CHROMEOS)
   const char* preferred_languages_prefs = prefs::kLanguagePreferredLanguages;
 #else
   const char* preferred_languages_prefs = NULL;
 #endif
@@ skipping 166 matching lines @@
   }
 
   // If the navigation happened while offline don't show the translate
   // bar since there will be nothing to translate.
   if (load_details.http_status_code == 0 ||
       load_details.http_status_code == net::HTTP_INTERNAL_SERVER_ERROR) {
     return;
   }
 
   if (!load_details.is_main_frame &&
-      GetLanguageState().translation_declined()) {
+      translate_driver_.GetLanguageState().translation_declined()) {
     // Some sites (such as Google map) may trigger sub-frame navigations
     // when the user interacts with the page.  We don't want to show a new
     // infobar if the user already dismissed one in that case.
     return;
   }
 
   // If not a reload, return.
   if (entry->GetTransitionType() != content::PAGE_TRANSITION_RELOAD &&
       load_details.type != content::NAVIGATION_TYPE_SAME_PAGE) {
     return;
   }
 
-  if (!GetLanguageState().page_needs_translation())
+  if (!translate_driver_.GetLanguageState().page_needs_translation())
     return;
 
   // Note that we delay it as the ordering of the processing of this callback
   // by WebContentsObservers is undefined and might result in the current
   // infobars being removed. Since the translation initiation process might add
   // an infobar, it must be done after that.
   base::MessageLoop::current()->PostTask(
       FROM_HERE,
       base::Bind(&TranslateTabHelper::InitiateTranslation,
                  weak_pointer_factory_.GetWeakPtr(),
-                 GetLanguageState().original_language(),
+                 translate_driver_.GetLanguageState().original_language(),
                  0));
 }
 
 void TranslateTabHelper::DidNavigateAnyFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   // Let the LanguageState clear its state.
-    const bool reload =
-        details.entry->GetTransitionType() == content::PAGE_TRANSITION_RELOAD ||
-        details.type == content::NAVIGATION_TYPE_SAME_PAGE;
-    GetLanguageState().DidNavigate(
-        details.is_in_page, details.is_main_frame, reload);
+  translate_driver_.DidNavigate(details);
 }
 
 void TranslateTabHelper::WebContentsDestroyed() {
   // Translation process can be interrupted.
   // Destroying the TranslateManager now guarantees that it never has to deal
   // with NULL WebContents.
   translate_manager_.reset();
 }
 
 #if defined(CLD2_DYNAMIC_MODE)
@@ skipping 125 matching lines @@
       s_cached_data_offset_ = data_offset;
       s_cached_data_length_ = data_length;
     }
   }
 }
 
 #endif  // defined(CLD2_DYNAMIC_MODE)
 
 void TranslateTabHelper::InitiateTranslation(const std::string& page_lang,
                                              int attempt) {
-  if (GetLanguageState().translation_pending())
+  if (translate_driver_.GetLanguageState().translation_pending())
     return;
 
   // During a reload we need web content to be available before the
   // translate script is executed. Otherwise we will run the translate script on
   // an empty DOM which will fail. Therefore we wait a bit to see if the page
   // has finished.
   if (web_contents()->IsLoading() && attempt < max_reload_check_attempts_) {
     int backoff = attempt * kMaxTranslateLoadCheckAttempts;
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&TranslateTabHelper::InitiateTranslation,
                    weak_pointer_factory_.GetWeakPtr(),
                    page_lang,
                    ++attempt),
         base::TimeDelta::FromMilliseconds(backoff));
     return;
   }
 
   translate_manager_->InitiateTranslation(
       TranslateDownloadManager::GetLanguageCode(page_lang));
 }
 
 void TranslateTabHelper::OnLanguageDetermined(
     const LanguageDetectionDetails& details,
     bool page_needs_translation) {
-  GetLanguageState().LanguageDetermined(
+  translate_driver_.GetLanguageState().LanguageDetermined(
       details.adopted_language, page_needs_translation);
 
   if (web_contents())
     translate_manager_->InitiateTranslation(details.adopted_language);
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED,
       content::Source<content::WebContents>(web_contents()),
       content::Details<const LanguageDetectionDetails>(&details));
 }
@@ skipping 48 matching lines @@
     if (GetLanguageState().InTranslateNavigation())
       return;
   }
 
   TranslateBubbleFactory::Show(
       browser->window(), web_contents(), step, error_type);
 #else
   NOTREACHED();
 #endif
 }