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

chrome/browser/translate/translate_manager.cc

Index: chrome/browser/translate/translate_manager.cc
===================================================================
--- chrome/browser/translate/translate_manager.cc	(revision 71973)
+++ chrome/browser/translate/translate_manager.cc	(working copy)
@@ -11,7 +11,6 @@
 #include "base/singleton.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
-#include "chrome/browser/autofill/autofill_manager.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ -34,6 +33,7 @@
 #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"
@@ -473,7 +473,8 @@
     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());
 }
@@ -510,14 +511,11 @@
   }
 
   tab->language_state().set_translation_pending(true);
-  tab->render_view_host()->TranslatePage(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();
+  tab->render_view_host()->Send(new ViewMsg_TranslatePage(
+      tab->render_view_host()->routing_id(), entry->page_id(), translate_script,
+      source_lang, target_lang));
+  tab->TranslateStarted();

[Ben Goodger (Google), 2011/01/20 22:38:24]

Does this need to go through the tab? It'd be nice to have WebNavigationObserver
not know about the Translate feature. The alternative here is to use a
Notification.

[jam, 2011/01/20 23:26:59]

good point.  I didn't like doing this either (actually TabContents is already
too involved in the details of translation, it would be good to separate this
out some more in future changes).  I looked into it and we can reuse the
page_translated notification, for this purpose it works as well as the
about_to_translate one.

[Ben Goodger (Google), 2011/01/20 23:44:09]

OK - can you add that as a TODO then if you don't want to do it here?

[jam, 2011/01/20 23:48:18]

I wasn't clear: I actually ended up using it in this change, patch was uploaded.

 }
 
 void TranslateManager::PageTranslated(TabContents* tab,