Move Translate browser-side IPC handling to the component.

chrome/browser/translate/chrome_translate_client.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 "chrome/browser/translate/chrome_translate_client.h"
 
 #include <vector>
 
 #include "base/logging.h"
 #include "base/path_service.h"
@@ skipping 43 matching lines @@
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(ChromeTranslateClient);
 
 ChromeTranslateClient::ChromeTranslateClient(content::WebContents* web_contents)
     : content::WebContentsObserver(web_contents),
       translate_driver_(&web_contents->GetController()),
       translate_manager_(
           new translate::TranslateManager(this, prefs::kAcceptLanguages)),
       cld_data_provider_(
           translate::CreateBrowserCldDataProviderFor(web_contents)) {
+  translate_driver_.AddObserver(this);
   translate_driver_.set_translate_manager(translate_manager_.get());
   // Customization: for the standalone data source, we configure the path to
   // CLD data immediately on startup.
   if (translate::CldDataSource::ShouldUseStandaloneDataFile() &&
       !g_cld_file_path_initialized_) {
     VLOG(1) << "Initializing CLD file path for the first time.";
     base::FilePath path;
     if (!PathService::Get(chrome::DIR_USER_DATA, &path)) {
       // Chrome isn't properly installed
       LOG(WARNING) << "Unable to locate user data directory";
     } else {
       g_cld_file_path_initialized_ = true;
       path = path.Append(kCldDataFileName);
       VLOG(1) << "Setting CLD data file path: " << path.value();
       translate::SetCldDataFilePath(path);
     }
   }
 }
 
 ChromeTranslateClient::~ChromeTranslateClient() {
+  translate_driver_.RemoveObserver(this);
 }
 
 translate::LanguageState& ChromeTranslateClient::GetLanguageState() {
   return translate_manager_->GetLanguageState();
 }
 
 // static
 scoped_ptr<translate::TranslatePrefs>
 ChromeTranslateClient::CreateTranslatePrefs(PrefService* prefs) {
 #if defined(OS_CHROMEOS)
@@ skipping 162 matching lines @@
     NOTREACHED();
     return;
   }
 
   chrome::AddSelectedTabWithURL(
       browser, report_url, content::PAGE_TRANSITION_AUTO_BOOKMARK);
 #endif  // defined(OS_ANDROID)
 }
 
 bool ChromeTranslateClient::OnMessageReceived(const IPC::Message& message) {
-  bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(ChromeTranslateClient, message)
-  IPC_MESSAGE_HANDLER(ChromeViewHostMsg_TranslateAssignedSequenceNumber,
-                      OnTranslateAssignedSequenceNumber)
-  IPC_MESSAGE_HANDLER(ChromeViewHostMsg_TranslateLanguageDetermined,
-                      OnLanguageDetermined)
-  IPC_MESSAGE_HANDLER(ChromeViewHostMsg_PageTranslated, OnPageTranslated)
-  IPC_MESSAGE_UNHANDLED(handled = false)
-  IPC_END_MESSAGE_MAP()
-
-  if (!handled) {
-    handled = cld_data_provider_->OnMessageReceived(message);
-  }
-  return handled;
+  return cld_data_provider_->OnMessageReceived(message);
 }
 
 void ChromeTranslateClient::WebContentsDestroyed() {
   // Translation process can be interrupted.
   // Destroying the TranslateManager now guarantees that it never has to deal
   // with NULL WebContents.
   translate_manager_.reset();
 }
 
-void ChromeTranslateClient::OnTranslateAssignedSequenceNumber(int page_seq_no) {
-  translate_manager_->set_current_seq_no(page_seq_no);
-}
+// ContentTranslateDriver::Observer implementation.
 
 void ChromeTranslateClient::OnLanguageDetermined(
-    const translate::LanguageDetectionDetails& details,
-    bool page_needs_translation) {
-  GetLanguageState().LanguageDetermined(details.adopted_language,
-                                        page_needs_translation);
-
-  if (web_contents())
-    translate_manager_->InitiateTranslation(details.adopted_language);
-
+    const translate::LanguageDetectionDetails& details) {
+  // TODO: Remove translate notifications and have the clients be
+  // TranslateDriver::Observer directly instead.

[Takashi Toyoshima, 2014/09/16 06:32:47]

I guess this means ContentTranslateDriver::Observer.

[droger, 2014/09/16 10:57:13]

Correct. Done.

   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_TAB_LANGUAGE_DETERMINED,
       content::Source<content::WebContents>(web_contents()),
       content::Details<const translate::LanguageDetectionDetails>(&details));
 }
 
 void ChromeTranslateClient::OnPageTranslated(
     const std::string& original_lang,
     const std::string& translated_lang,
     translate::TranslateErrors::Type error_type) {
+  // TODO: Remove translate notifications and have the clients be

[Takashi Toyoshima, 2014/09/16 06:32:47]

ditto

+  // TranslateDriver::Observer directly instead.
   DCHECK(web_contents());
-  translate_manager_->PageTranslated(
-      original_lang, translated_lang, error_type);
-
   translate::PageTranslatedDetails details;
   details.source_language = original_lang;
   details.target_language = translated_lang;
   details.error_type = error_type;
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PAGE_TRANSLATED,
       content::Source<content::WebContents>(web_contents()),
       content::Details<translate::PageTranslatedDetails>(&details));
 }
 
@@ skipping 30 matching lines @@
     if (GetLanguageState().InTranslateNavigation())
       return;
   }
 
   TranslateBubbleFactory::Show(
       browser->window(), web_contents(), step, error_type);
 #else
   NOTREACHED();
 #endif
 }