Clean up WebNavigationObserver by taking out password specific callbacks, and...

chrome/browser/translate/translate_manager.cc

 // Copyright (c) 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_manager.h"
 
 #include "app/resource_bundle.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/metrics/histogram.h"
@@ skipping 16 matching lines @@
 #include "chrome/browser/translate/page_translated_details.h"
 #include "chrome/browser/translate/translate_infobar_delegate.h"
 #include "chrome/browser/translate/translate_prefs.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/notification_details.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/notification_source.h"
 #include "chrome/common/notification_type.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/common/render_messages.h"
 #include "chrome/common/translate_errors.h"
 #include "chrome/common/url_constants.h"
 #include "grit/browser_resources.h"
 #include "net/base/escape.h"
 #include "net/url_request/url_request_status.h"
 
 namespace {
 
 // Mapping from a locale name to a language code name.
 // Locale names not included are translated as is.
@@ skipping 419 matching lines @@
   pending_requests_.push_back(request);
   RequestTranslateScript();
 }
 
 void TranslateManager::RevertTranslation(TabContents* tab_contents) {
   NavigationEntry* entry = tab_contents->controller().GetActiveEntry();
   if (!entry) {
     NOTREACHED();
     return;
   }
-  tab_contents->render_view_host()->RevertTranslation(entry->page_id());
+  tab_contents->render_view_host()->Send(new ViewMsg_RevertTranslation(
+      tab_contents->render_view_host()->routing_id(), entry->page_id()));
   tab_contents->language_state().set_current_language(
       tab_contents->language_state().original_language());
 }
 
 void TranslateManager::ReportLanguageDetectionError(TabContents* tab_contents) {
   UMA_HISTOGRAM_COUNTS("Translate.ReportLanguageDetectionError", 1);
   GURL page_url = tab_contents->controller().GetActiveEntry()->url();
   std::string report_error_url(kReportLanguageDetectionErrorURL);
   report_error_url += "?client=cr&action=langidc&u=";
   report_error_url += EscapeUrlEncodedData(page_url.spec());
@@ skipping 16 matching lines @@
                                        const std::string& translate_script,
                                        const std::string& source_lang,
                                        const std::string& target_lang) {
   NavigationEntry* entry = tab->controller().GetActiveEntry();
   if (!entry) {
     NOTREACHED();
     return;
   }
 
   tab->language_state().set_translation_pending(true);
-  tab->render_view_host()->TranslatePage(entry->page_id(), translate_script,
-                                         source_lang, target_lang);
+
+  tab->render_view_host()->Send(new ViewMsg_TranslatePage(
+      tab->render_view_host()->routing_id(), entry->page_id(), translate_script,
+      source_lang, target_lang));
 
   // Ideally we'd have a better way to uniquely identify form control elements,
   // but we don't have that yet.  So before start translation, we clear the
   // current form and re-parse it in AutoFillManager first to get the new
   // labels.
   tab->autofill_manager()->Reset();
 }
 
 void TranslateManager::PageTranslated(TabContents* tab,
                                       PageTranslatedDetails* details) {
@@ skipping 107 matching lines @@
 TranslateInfoBarDelegate* TranslateManager::GetTranslateInfoBarDelegate(
     TabContents* tab) {
   for (int i = 0; i < tab->infobar_delegate_count(); ++i) {
     TranslateInfoBarDelegate* delegate =
         tab->GetInfoBarDelegateAt(i)->AsTranslateInfoBarDelegate();
     if (delegate)
       return delegate;
   }
   return NULL;
 }