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

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

Issue 15470004: Translate: display alpha language name with (alpha) suffix (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: update resource description Created 7 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_manager.h" 5 #include "chrome/browser/translate/translate_manager.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/memory/singleton.h" 10 #include "base/memory/singleton.h"
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 } 149 }
150 150
151 // static 151 // static
152 bool TranslateManager::IsSupportedLanguage(const std::string& language) { 152 bool TranslateManager::IsSupportedLanguage(const std::string& language) {
153 if (GetInstance()->language_list_.get()) 153 if (GetInstance()->language_list_.get())
154 return GetInstance()->language_list_->IsSupportedLanguage(language); 154 return GetInstance()->language_list_->IsSupportedLanguage(language);
155 NOTREACHED(); 155 NOTREACHED();
156 return false; 156 return false;
157 } 157 }
158 158
159 // static
160 bool TranslateManager::IsAlphaLanguage(const std::string& language) {
161 if (GetInstance()->language_list_.get())
162 return GetInstance()->language_list_->IsAlphaLanguage(language);
163 NOTREACHED();
164 return false;
165 }
166
159 void TranslateManager::Observe(int type, 167 void TranslateManager::Observe(int type,
160 const content::NotificationSource& source, 168 const content::NotificationSource& source,
161 const content::NotificationDetails& details) { 169 const content::NotificationDetails& details) {
162 switch (type) { 170 switch (type) {
163 case content::NOTIFICATION_NAV_ENTRY_COMMITTED: { 171 case content::NOTIFICATION_NAV_ENTRY_COMMITTED: {
164 NavigationController* controller = 172 NavigationController* controller =
165 content::Source<NavigationController>(source).ptr(); 173 content::Source<NavigationController>(source).ptr();
166 content::LoadCommittedDetails* load_details = 174 content::LoadCommittedDetails* load_details =
167 content::Details<content::LoadCommittedDetails>(details).ptr(); 175 content::Details<content::LoadCommittedDetails>(details).ptr();
168 NavigationEntry* entry = controller->GetActiveEntry(); 176 NavigationEntry* entry = controller->GetActiveEntry();
(...skipping 531 matching lines...) Expand 10 before | Expand all | Expand 10 after
700 // the default Accept-Language values for most locales, remove this 708 // the default Accept-Language values for most locales, remove this
701 // special-casing. 709 // special-casing.
702 if (accept_lang != "en" || is_ui_english) 710 if (accept_lang != "en" || is_ui_english)
703 accept_langs_set.insert(accept_lang); 711 accept_langs_set.insert(accept_lang);
704 } 712 }
705 accept_languages_[prefs] = accept_langs_set; 713 accept_languages_[prefs] = accept_langs_set;
706 } 714 }
707 715
708 void TranslateManager::FetchLanguageListFromTranslateServer( 716 void TranslateManager::FetchLanguageListFromTranslateServer(
709 PrefService* prefs) { 717 PrefService* prefs) {
710 DCHECK(language_list_.get());
711
712 // We don't want to do this when translate is disabled. 718 // We don't want to do this when translate is disabled.
713 DCHECK(prefs != NULL); 719 DCHECK(prefs != NULL);
714 if (CommandLine::ForCurrentProcess()->HasSwitch( 720 if (CommandLine::ForCurrentProcess()->HasSwitch(
715 switches::kDisableTranslate) || 721 switches::kDisableTranslate) ||
716 (prefs != NULL && !prefs->GetBoolean(prefs::kEnableTranslate))) { 722 (prefs != NULL && !prefs->GetBoolean(prefs::kEnableTranslate))) {
717 return; 723 return;
718 } 724 }
719 725
720 if (language_list_.get()) 726 if (language_list_.get())
721 language_list_->RequestLanguageList(); 727 language_list_->RequestLanguageList();
728 else
729 NOTREACHED();
MAD 2013/05/29 14:09:32 Thanks! :-)
722 } 730 }
723 731
724 void TranslateManager::CleanupPendingUlrFetcher() { 732 void TranslateManager::CleanupPendingUlrFetcher() {
725 language_list_.reset(); 733 language_list_.reset();
726 translate_script_request_pending_.reset(); 734 translate_script_request_pending_.reset();
727 } 735 }
728 736
729 void TranslateManager::RequestTranslateScript() { 737 void TranslateManager::RequestTranslateScript() {
730 if (translate_script_request_pending_.get() != NULL) 738 if (translate_script_request_pending_.get() != NULL)
731 return; 739 return;
(...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after
803 // reason so we are more aggressive showing the shortcuts for never translate. 811 // reason so we are more aggressive showing the shortcuts for never translate.
804 #if defined(OS_ANDROID) 812 #if defined(OS_ANDROID)
805 config.never_translate_min_count = 1; 813 config.never_translate_min_count = 1;
806 #else 814 #else
807 config.never_translate_min_count = 3; 815 config.never_translate_min_count = 3;
808 #endif // defined(OS_ANDROID) 816 #endif // defined(OS_ANDROID)
809 817
810 config.always_translate_min_count = 3; 818 config.always_translate_min_count = 3;
811 return config; 819 return config;
812 } 820 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698