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

Side by Side Diff: chrome/browser/translate/translate_tab_helper.cc

Issue 159883002: Move TranslatePrefs to the Translate component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@acceptLanguages
Patch Set: Fix ChromeOS browsertests Created 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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 "chrome/browser/translate/translate_tab_helper.h" 5 #include "chrome/browser/translate/translate_tab_helper.h"
6 6
7 #include "chrome/browser/chrome_notification_types.h" 7 #include "chrome/browser/chrome_notification_types.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/translate/translate_accept_languages_factory.h"
9 #include "chrome/browser/translate/translate_infobar_delegate.h" 10 #include "chrome/browser/translate/translate_infobar_delegate.h"
10 #include "chrome/browser/translate/translate_service.h" 11 #include "chrome/browser/translate/translate_service.h"
11 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
12 #include "chrome/browser/ui/browser_finder.h" 13 #include "chrome/browser/ui/browser_finder.h"
13 #include "chrome/browser/ui/browser_window.h" 14 #include "chrome/browser/ui/browser_window.h"
14 #include "chrome/browser/ui/tabs/tab_strip_model.h" 15 #include "chrome/browser/ui/tabs/tab_strip_model.h"
15 #include "chrome/browser/ui/translate/translate_bubble_factory.h" 16 #include "chrome/browser/ui/translate/translate_bubble_factory.h"
17 #include "chrome/common/pref_names.h"
16 #include "chrome/common/render_messages.h" 18 #include "chrome/common/render_messages.h"
17 #include "components/translate/core/browser/page_translated_details.h" 19 #include "components/translate/core/browser/page_translated_details.h"
20 #include "components/translate/core/browser/translate_accept_languages.h"
21 #include "components/translate/core/browser/translate_prefs.h"
18 #include "components/translate/core/common/language_detection_details.h" 22 #include "components/translate/core/common/language_detection_details.h"
19 #include "content/public/browser/notification_service.h" 23 #include "content/public/browser/notification_service.h"
20 #include "content/public/browser/web_contents.h" 24 #include "content/public/browser/web_contents.h"
21 25
22 namespace { 26 namespace {
23 27
24 // Converts from TranslateTabHelper::TranslateStep to 28 // Converts from TranslateTabHelper::TranslateStep to
25 // TranslateBubbleModel::ViewState. 29 // TranslateBubbleModel::ViewState.
26 TranslateBubbleModel::ViewState BubbleViewStateFromStep( 30 TranslateBubbleModel::ViewState BubbleViewStateFromStep(
27 TranslateTabHelper::TranslateStep step, 31 TranslateTabHelper::TranslateStep step,
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
82 translate_driver_(&web_contents->GetController()) { 86 translate_driver_(&web_contents->GetController()) {
83 } 87 }
84 88
85 TranslateTabHelper::~TranslateTabHelper() { 89 TranslateTabHelper::~TranslateTabHelper() {
86 } 90 }
87 91
88 LanguageState& TranslateTabHelper::GetLanguageState() { 92 LanguageState& TranslateTabHelper::GetLanguageState() {
89 return translate_driver_.language_state(); 93 return translate_driver_.language_state();
90 } 94 }
91 95
96 // static
97 scoped_ptr<TranslatePrefs> TranslateTabHelper::CreateTranslatePrefs(
98 PrefService* prefs) {
99 #if defined(OS_CHROMEOS)
100 const char* preferred_languages_prefs = prefs::kLanguagePreferredLanguages;
101 #else
102 const char* preferred_languages_prefs = NULL;
103 #endif
104 return scoped_ptr<TranslatePrefs>(new TranslatePrefs(
105 prefs, prefs::kAcceptLanguages, preferred_languages_prefs));
106 }
107
108 // static
109 TranslateAcceptLanguages* TranslateTabHelper::GetTranslateAcceptLanguages(
110 content::BrowserContext* browser_context) {
111 return TranslateAcceptLanguagesFactory::GetForBrowserContext(browser_context);
112 }
113
92 void TranslateTabHelper::ShowTranslateUI(TranslateTabHelper::TranslateStep step, 114 void TranslateTabHelper::ShowTranslateUI(TranslateTabHelper::TranslateStep step,
93 content::WebContents* web_contents, 115 content::WebContents* web_contents,
94 const std::string source_language, 116 const std::string source_language,
95 const std::string target_language, 117 const std::string target_language,
96 TranslateErrors::Type error_type) { 118 TranslateErrors::Type error_type) {
97 if (TranslateService::IsTranslateBubbleEnabled()) { 119 if (TranslateService::IsTranslateBubbleEnabled()) {
98 // Bubble UI. 120 // Bubble UI.
99 TranslateBubbleModel::ViewState view_state = 121 TranslateBubbleModel::ViewState view_state =
100 BubbleViewStateFromStep(step, error_type); 122 BubbleViewStateFromStep(step, error_type);
101 if (view_state == TranslateBubbleModel::VIEW_STATE_BEFORE_TRANSLATE) { 123 if (view_state == TranslateBubbleModel::VIEW_STATE_BEFORE_TRANSLATE) {
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 if (GetLanguageState().InTranslateNavigation()) 230 if (GetLanguageState().InTranslateNavigation())
209 return; 231 return;
210 } 232 }
211 233
212 TranslateBubbleFactory::Show( 234 TranslateBubbleFactory::Show(
213 browser->window(), web_contents, view_state, error_type); 235 browser->window(), web_contents, view_state, error_type);
214 #else 236 #else
215 NOTREACHED(); 237 NOTREACHED();
216 #endif 238 #endif
217 } 239 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698