Chromium Code Reviews| Index: chrome/browser/ui/webui/options/browser_options_handler.cc |
| diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc |
| index 671c979e12a076a22c6db9badd9675966a87e40f..a5f28805579036758fc8295a8c997577d716af2a 100644 |
| --- a/chrome/browser/ui/webui/options/browser_options_handler.cc |
| +++ b/chrome/browser/ui/webui/options/browser_options_handler.cc |
| @@ -49,6 +49,7 @@ |
| #include "chrome/browser/ui/chrome_select_file_policy.h" |
| #include "chrome/browser/ui/host_desktop.h" |
| #include "chrome/browser/ui/options/options_util.h" |
| +#include "chrome/browser/ui/search/search.h" |
| #include "chrome/browser/ui/webui/chrome_url_data_manager.h" |
| #include "chrome/browser/ui/webui/favicon_source.h" |
| #include "chrome/browser/ui/webui/web_ui_util.h" |
| @@ -393,10 +394,17 @@ void BrowserOptionsHandler::GetLocalizedValues(DictionaryValue* values) { |
| l10n_util::GetStringFUTF16(IDS_SEARCH_PREF_EXPLANATION, omnibox_url)); |
| string16 instant_learn_more_url = ASCIIToUTF16(chrome::kInstantLearnMoreURL); |
| + int instant_message_id = IDS_INSTANT_PREF_WITH_WARNING; |
| + if (chrome::search::IsInstantExtendedAPIEnabled( |
| + Profile::FromWebUI(web_ui()))) { |
|
Evan Stade
2012/12/08 23:45:22
4 more indent
MAD
2012/12/09 00:27:10
Again, coding style says only 4 as is done here. T
|
| + instant_message_id = IDS_INSTANT_EXTENDED_PREF_WITH_WARNING; |
| + values->SetString("instant_enabled", "instant_extended.enabled"); |
| + } else { |
| + values->SetString("instant_enabled", "instant.enabled"); |
| + } |
| values->SetString( |
| "instantPrefAndWarning", |
| - l10n_util::GetStringFUTF16(IDS_INSTANT_PREF_WITH_WARNING, |
| - instant_learn_more_url)); |
| + l10n_util::GetStringFUTF16(instant_message_id, instant_learn_more_url)); |
| values->SetString("instantLearnMoreLink", instant_learn_more_url); |
| #if defined(OS_CHROMEOS) |