Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5005)

Unified Diff: chrome/renderer/render_view.cc

Issue 577032: The translate feature was only translating the main frame of the page.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/renderer/navigation_state.h ('k') | chrome/renderer/translate/page_translator.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/renderer/render_view.cc
===================================================================
--- chrome/renderer/render_view.cc (revision 38414)
+++ chrome/renderer/render_view.cc (working copy)
@@ -1184,9 +1184,6 @@
host_zoom_levels_.erase(host_zoom);
}
- // Drop the translated nodes.
- page_translator_->NavigatedToNewPage();
-
// Update contents MIME type for main frame.
params.contents_mime_type = ds->response().mimeType().utf8();
@@ -2409,6 +2406,12 @@
NavigationState* navigation_state =
NavigationState::FromDataSource(frame->dataSource());
+ if (!frame->parent()) { // Main frame case.
+ // Let the page translator know that the page has changed so it can clear
+ // its states.
+ page_translator_->MainFrameNavigated();
+ }
+
navigation_state->set_commit_load_time(Time::Now());
if (is_new_navigation) {
// When we perform a new navigation, we need to update the previous session
@@ -2521,6 +2524,9 @@
}
navigation_state->user_script_idle_scheduler()->DidFinishDocumentLoad();
+
+ if (page_translator_->IsPageTranslated())
+ page_translator_->TranslateFrame(frame);
}
void RenderView::OnUserScriptIdleTriggered(WebFrame* frame) {
@@ -3435,7 +3441,9 @@
WebFrame* main_frame = webview()->mainFrame();
if (!main_frame)
return;
- page_translator_->Translate(page_id, main_frame, source_lang, target_lang);
+
+ page_translator_->TranslatePage(page_id, main_frame,
+ source_lang, target_lang);
}
void RenderView::OnTranslateTextResponse(
« no previous file with comments | « chrome/renderer/navigation_state.h ('k') | chrome/renderer/translate/page_translator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698