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

Side by Side Diff: trunk/src/components/translate/content/browser/content_translate_driver.cc

Issue 296003014: Revert 272217 "LanguageState should be owned by TranslateManager" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 7 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/translate/content/browser/content_translate_driver.h" 5 #include "components/translate/content/browser/content_translate_driver.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "components/translate/content/common/translate_messages.h" 8 #include "components/translate/content/common/translate_messages.h"
9 #include "content/public/browser/browser_context.h" 9 #include "content/public/browser/browser_context.h"
10 #include "content/public/browser/navigation_controller.h" 10 #include "content/public/browser/navigation_controller.h"
11 #include "content/public/browser/navigation_details.h"
11 #include "content/public/browser/navigation_entry.h" 12 #include "content/public/browser/navigation_entry.h"
12 #include "content/public/browser/page_navigator.h" 13 #include "content/public/browser/page_navigator.h"
13 #include "content/public/browser/render_view_host.h" 14 #include "content/public/browser/render_view_host.h"
14 #include "content/public/browser/web_contents.h" 15 #include "content/public/browser/web_contents.h"
15 #include "content/public/common/referrer.h" 16 #include "content/public/common/referrer.h"
16 #include "url/gurl.h" 17 #include "url/gurl.h"
17 18
18 ContentTranslateDriver::ContentTranslateDriver( 19 ContentTranslateDriver::ContentTranslateDriver(
19 content::NavigationController* nav_controller) 20 content::NavigationController* nav_controller)
20 : navigation_controller_(nav_controller), 21 : navigation_controller_(nav_controller),
22 language_state_(this),
21 observer_(NULL) { 23 observer_(NULL) {
22 DCHECK(navigation_controller_); 24 DCHECK(navigation_controller_);
23 } 25 }
24 26
25 ContentTranslateDriver::~ContentTranslateDriver() {} 27 ContentTranslateDriver::~ContentTranslateDriver() {}
26 28
29 void ContentTranslateDriver::DidNavigate(
30 const content::LoadCommittedDetails& details) {
31 const bool reload =
32 details.entry->GetTransitionType() == content::PAGE_TRANSITION_RELOAD ||
33 details.type == content::NAVIGATION_TYPE_SAME_PAGE;
34 language_state_.DidNavigate(
35 details.is_in_page, details.is_main_frame, reload);
36 }
37
27 // TranslateDriver methods 38 // TranslateDriver methods
28 39
29 bool ContentTranslateDriver::IsLinkNavigation() { 40 bool ContentTranslateDriver::IsLinkNavigation() {
30 return navigation_controller_ && navigation_controller_->GetActiveEntry() && 41 return navigation_controller_ && navigation_controller_->GetActiveEntry() &&
31 navigation_controller_->GetActiveEntry()->GetTransitionType() == 42 navigation_controller_->GetActiveEntry()->GetTransitionType() ==
32 content::PAGE_TRANSITION_LINK; 43 content::PAGE_TRANSITION_LINK;
33 } 44 }
34 45
35 void ContentTranslateDriver::OnTranslateEnabledChanged() { 46 void ContentTranslateDriver::OnTranslateEnabledChanged() {
36 if (observer_) { 47 if (observer_) {
37 content::WebContents* web_contents = 48 content::WebContents* web_contents =
38 navigation_controller_->GetWebContents(); 49 navigation_controller_->GetWebContents();
39 observer_->OnTranslateEnabledChanged(web_contents); 50 observer_->OnTranslateEnabledChanged(web_contents);
40 } 51 }
41 } 52 }
42 53
43 void ContentTranslateDriver::OnIsPageTranslatedChanged() { 54 void ContentTranslateDriver::OnIsPageTranslatedChanged() {
44 if (observer_) { 55 if (observer_) {
45 content::WebContents* web_contents = 56 content::WebContents* web_contents =
46 navigation_controller_->GetWebContents(); 57 navigation_controller_->GetWebContents();
47 observer_->OnIsPageTranslatedChanged(web_contents); 58 observer_->OnIsPageTranslatedChanged(web_contents);
48 } 59 }
49 } 60 }
50 61
62 LanguageState& ContentTranslateDriver::GetLanguageState() {
63 return language_state_;
64 }
65
51 void ContentTranslateDriver::TranslatePage(const std::string& translate_script, 66 void ContentTranslateDriver::TranslatePage(const std::string& translate_script,
52 const std::string& source_lang, 67 const std::string& source_lang,
53 const std::string& target_lang) { 68 const std::string& target_lang) {
54 content::NavigationEntry* entry = navigation_controller_->GetActiveEntry(); 69 content::NavigationEntry* entry = navigation_controller_->GetActiveEntry();
55 if (!entry) { 70 if (!entry) {
56 NOTREACHED(); 71 NOTREACHED();
57 return; 72 return;
58 } 73 }
59 74
60 content::WebContents* web_contents = navigation_controller_->GetWebContents(); 75 content::WebContents* web_contents = navigation_controller_->GetWebContents();
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 } 127 }
113 128
114 void ContentTranslateDriver::OpenUrlInNewTab(const GURL& url) { 129 void ContentTranslateDriver::OpenUrlInNewTab(const GURL& url) {
115 content::OpenURLParams params(url, 130 content::OpenURLParams params(url,
116 content::Referrer(), 131 content::Referrer(),
117 NEW_FOREGROUND_TAB, 132 NEW_FOREGROUND_TAB,
118 content::PAGE_TRANSITION_LINK, 133 content::PAGE_TRANSITION_LINK,
119 false); 134 false);
120 navigation_controller_->GetWebContents()->OpenURL(params); 135 navigation_controller_->GetWebContents()->OpenURL(params);
121 } 136 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698