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

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

Issue 312023002: Sync starting language and input method preferences (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 6 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 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 <vector> 7 #include <vector>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 } 81 }
82 82
83 LanguageState& TranslateTabHelper::GetLanguageState() { 83 LanguageState& TranslateTabHelper::GetLanguageState() {
84 return translate_driver_.GetLanguageState(); 84 return translate_driver_.GetLanguageState();
85 } 85 }
86 86
87 // static 87 // static
88 scoped_ptr<TranslatePrefs> TranslateTabHelper::CreateTranslatePrefs( 88 scoped_ptr<TranslatePrefs> TranslateTabHelper::CreateTranslatePrefs(
89 PrefService* prefs) { 89 PrefService* prefs) {
90 #if defined(OS_CHROMEOS) 90 #if defined(OS_CHROMEOS)
91 const char* preferred_languages_prefs = prefs::kLanguagePreferredLanguages; 91 const char* preferred_languages_prefs =
92 prefs::kLanguagePreferredLanguagesLocal;
92 #else 93 #else
93 const char* preferred_languages_prefs = NULL; 94 const char* preferred_languages_prefs = NULL;
94 #endif 95 #endif
95 return scoped_ptr<TranslatePrefs>(new TranslatePrefs( 96 return scoped_ptr<TranslatePrefs>(new TranslatePrefs(
96 prefs, prefs::kAcceptLanguages, preferred_languages_prefs)); 97 prefs, prefs::kAcceptLanguages, preferred_languages_prefs));
97 } 98 }
98 99
99 // static 100 // static
100 TranslateAcceptLanguages* TranslateTabHelper::GetTranslateAcceptLanguages( 101 TranslateAcceptLanguages* TranslateTabHelper::GetTranslateAcceptLanguages(
101 content::BrowserContext* browser_context) { 102 content::BrowserContext* browser_context) {
(...skipping 439 matching lines...) Expand 10 before | Expand all | Expand 10 after
541 if (GetLanguageState().InTranslateNavigation()) 542 if (GetLanguageState().InTranslateNavigation())
542 return; 543 return;
543 } 544 }
544 545
545 TranslateBubbleFactory::Show( 546 TranslateBubbleFactory::Show(
546 browser->window(), web_contents(), step, error_type); 547 browser->window(), web_contents(), step, error_type);
547 #else 548 #else
548 NOTREACHED(); 549 NOTREACHED();
549 #endif 550 #endif
550 } 551 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698