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

Side by Side Diff: chrome/browser/ui/webui/options/language_options_handler_common.cc

Issue 16141002: Add "Don't translate" preference to chrome://settings/languages (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
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/ui/webui/options/language_options_handler_common.h" 5 #include "chrome/browser/ui/webui/options/language_options_handler_common.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 #include <utility> 9 #include <utility>
10 #include <vector> 10 #include <vector>
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
69 { "enable_spell_check", IDS_OPTIONS_ENABLE_SPELLCHECK }, 69 { "enable_spell_check", IDS_OPTIONS_ENABLE_SPELLCHECK },
70 { "enable_auto_spell_correction", 70 { "enable_auto_spell_correction",
71 IDS_OPTIONS_ENABLE_AUTO_SPELL_CORRECTION }, 71 IDS_OPTIONS_ENABLE_AUTO_SPELL_CORRECTION },
72 { "downloading_dictionary", IDS_OPTIONS_DICTIONARY_DOWNLOADING }, 72 { "downloading_dictionary", IDS_OPTIONS_DICTIONARY_DOWNLOADING },
73 { "download_failed", IDS_OPTIONS_DICTIONARY_DOWNLOAD_FAILED }, 73 { "download_failed", IDS_OPTIONS_DICTIONARY_DOWNLOAD_FAILED },
74 { "retry_button", IDS_OPTIONS_DICTIONARY_DOWNLOAD_RETRY }, 74 { "retry_button", IDS_OPTIONS_DICTIONARY_DOWNLOAD_RETRY },
75 { "download_fail_help", IDS_OPTIONS_DICTIONARY_DOWNLOAD_FAIL_HELP }, 75 { "download_fail_help", IDS_OPTIONS_DICTIONARY_DOWNLOAD_FAIL_HELP },
76 #endif // !OS_MACOSX 76 #endif // !OS_MACOSX
77 { "add_language_title", IDS_OPTIONS_LANGUAGES_ADD_TITLE }, 77 { "add_language_title", IDS_OPTIONS_LANGUAGES_ADD_TITLE },
78 { "add_language_select_label", IDS_OPTIONS_LANGUAGES_ADD_SELECT_LABEL }, 78 { "add_language_select_label", IDS_OPTIONS_LANGUAGES_ADD_SELECT_LABEL },
79 { "restart_button", IDS_OPTIONS_SETTINGS_LANGUAGES_RELAUNCH_BUTTON } 79 { "restart_button", IDS_OPTIONS_SETTINGS_LANGUAGES_RELAUNCH_BUTTON },
80 { "dont_translate", IDS_OPTIONS_LANGUAGES_DONT_TRANSLATE }
80 }; 81 };
81 82
82 #if defined(ENABLE_SETTINGS_APP) 83 #if defined(ENABLE_SETTINGS_APP)
83 static OptionsStringResource app_resources[] = { 84 static OptionsStringResource app_resources[] = {
84 { "cannot_be_displayed_in_this_language", 85 { "cannot_be_displayed_in_this_language",
85 IDS_OPTIONS_SETTINGS_LANGUAGES_CANNOT_BE_DISPLAYED_IN_THIS_LANGUAGE, 86 IDS_OPTIONS_SETTINGS_LANGUAGES_CANNOT_BE_DISPLAYED_IN_THIS_LANGUAGE,
86 IDS_SETTINGS_APP_LAUNCHER_PRODUCT_NAME }, 87 IDS_SETTINGS_APP_LAUNCHER_PRODUCT_NAME },
87 { "is_displayed_in_this_language", 88 { "is_displayed_in_this_language",
88 IDS_OPTIONS_SETTINGS_LANGUAGES_IS_DISPLAYED_IN_THIS_LANGUAGE, 89 IDS_OPTIONS_SETTINGS_LANGUAGES_IS_DISPLAYED_IN_THIS_LANGUAGE,
89 IDS_SETTINGS_APP_LAUNCHER_PRODUCT_NAME }, 90 IDS_SETTINGS_APP_LAUNCHER_PRODUCT_NAME },
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 } 233 }
233 234
234 base::WeakPtr<SpellcheckHunspellDictionary>& 235 base::WeakPtr<SpellcheckHunspellDictionary>&
235 LanguageOptionsHandlerCommon::GetHunspellDictionary() { 236 LanguageOptionsHandlerCommon::GetHunspellDictionary() {
236 if (!hunspell_dictionary_.get()) 237 if (!hunspell_dictionary_.get())
237 RefreshHunspellDictionary(); 238 RefreshHunspellDictionary();
238 return hunspell_dictionary_; 239 return hunspell_dictionary_;
239 } 240 }
240 241
241 } // namespace options 242 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698