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

Unified Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 14189011: Remove instant confirmation dialog that is displayed the first time the instant checkbox is clicked. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove prefs::InstantConfirmDialogShown Created 7 years, 8 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 side-by-side diff with in-line comments
Download patch
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 e0e0c8e0e41f8a5de4e3dd9c038ecf93490587eb..5b9da82a8226c90245da488ba7702f460cb2fa07 100644
--- a/chrome/browser/ui/webui/options/browser_options_handler.cc
+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc
@@ -237,7 +237,6 @@ void BrowserOptionsHandler::GetLocalizedValues(DictionaryValue* values) {
{ "homePageShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON },
{ "homePageUseNewTab", IDS_OPTIONS_HOMEPAGE_USE_NEWTAB },
{ "homePageUseURL", IDS_OPTIONS_HOMEPAGE_USE_URL },
- { "instantConfirmMessage", IDS_INSTANT_OPT_IN_MESSAGE },
{ "importData", IDS_OPTIONS_IMPORT_DATA_BUTTON },
{ "improveBrowsingExperience", IDS_OPTIONS_IMPROVE_BROWSING_EXPERIENCE },
{ "languageAndSpellCheckSettingsButton",
@@ -411,7 +410,6 @@ void BrowserOptionsHandler::GetLocalizedValues(DictionaryValue* values) {
#endif
RegisterStrings(values, resources, arraysize(resources));
- RegisterTitle(values, "instantConfirmOverlay", IDS_INSTANT_OPT_IN_TITLE);
RegisterTitle(values, "doNotTrackConfirmOverlay",
IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_TITLE);
RegisterTitle(values, "spellingConfirmOverlay",
@@ -427,12 +425,10 @@ void BrowserOptionsHandler::GetLocalizedValues(DictionaryValue* values) {
std::string instant_pref_name = chrome::GetInstantPrefName();
int instant_message_id = instant_pref_name == prefs::kInstantEnabled ?
IDS_INSTANT_PREF_WITH_WARNING : IDS_INSTANT_EXTENDED_PREF_WITH_WARNING;
- string16 instant_learn_more_url = ASCIIToUTF16(chrome::kInstantLearnMoreURL);
values->SetString("instant_enabled", instant_pref_name);
values->SetString(
"instantPrefAndWarning",
- l10n_util::GetStringFUTF16(instant_message_id, instant_learn_more_url));
- values->SetString("instantLearnMoreLink", instant_learn_more_url);
+ l10n_util::GetStringUTF16(instant_message_id));
#if defined(OS_CHROMEOS)
const chromeos::User* user = chromeos::UserManager::Get()->GetLoggedInUser();
« no previous file with comments | « chrome/browser/sync/test/integration/two_client_preferences_sync_test.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698