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

Side by Side Diff: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

Issue 2572963004: MD Settings: Add "Show Google Now cards in the launcher" row in Search section. (Closed)
Patch Set: Rebase Created 4 years 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/settings/md_settings_localized_strings_provide r.h" 5 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provide r.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/i18n/number_formatting.h" 10 #include "base/i18n/number_formatting.h"
(...skipping 1368 matching lines...) Expand 10 before | Expand all | Expand 10 after
1379 {"searchOkGoogleSubtextAlwaysOn", 1379 {"searchOkGoogleSubtextAlwaysOn",
1380 IDS_SETTINGS_SEARCH_OK_GOOGLE_SUBTEXT_ALWAYS_ON}, 1380 IDS_SETTINGS_SEARCH_OK_GOOGLE_SUBTEXT_ALWAYS_ON},
1381 {"searchOkGoogleSubtextNoHardware", 1381 {"searchOkGoogleSubtextNoHardware",
1382 IDS_SETTINGS_SEARCH_OK_GOOGLE_SUBTEXT_NO_HARDWARE}, 1382 IDS_SETTINGS_SEARCH_OK_GOOGLE_SUBTEXT_NO_HARDWARE},
1383 {"searchOkGoogleLearnMore", IDS_SETTINGS_SEARCH_OK_GOOGLE_LEARN_MORE}, 1383 {"searchOkGoogleLearnMore", IDS_SETTINGS_SEARCH_OK_GOOGLE_LEARN_MORE},
1384 {"searchOkGoogleAudioHistoryLabel", 1384 {"searchOkGoogleAudioHistoryLabel",
1385 IDS_SETTINGS_SEARCH_OK_GOOGLE_AUDIO_HISTORY_LABEL}, 1385 IDS_SETTINGS_SEARCH_OK_GOOGLE_AUDIO_HISTORY_LABEL},
1386 {"searchOkGoogleAudioHistorySubtext", 1386 {"searchOkGoogleAudioHistorySubtext",
1387 IDS_SETTINGS_SEARCH_OK_GOOGLE_AUDIO_HISTORY_SUBTEXT}, 1387 IDS_SETTINGS_SEARCH_OK_GOOGLE_AUDIO_HISTORY_SUBTEXT},
1388 {"searchOkGoogleRetrain", IDS_SETTINGS_SEARCH_OK_GOOGLE_RETRAIN}, 1388 {"searchOkGoogleRetrain", IDS_SETTINGS_SEARCH_OK_GOOGLE_RETRAIN},
1389 {"searchEnableGoogleNowLabel", IDS_SETTINGS_SEARCH_ENABLE_GOOGLE_NOW},
1389 }; 1390 };
1390 AddLocalizedStringsBulk(html_source, localized_strings, 1391 AddLocalizedStringsBulk(html_source, localized_strings,
1391 arraysize(localized_strings)); 1392 arraysize(localized_strings));
1392 html_source->AddString("hotwordLearnMoreUrl", 1393 html_source->AddString("hotwordLearnMoreUrl",
1393 chrome::kHotwordLearnMoreURL); 1394 chrome::kHotwordLearnMoreURL);
1394 html_source->AddString("manageAudioHistoryUrl", 1395 html_source->AddString("manageAudioHistoryUrl",
1395 chrome::kManageAudioHistoryURL); 1396 chrome::kManageAudioHistoryURL);
1396 } 1397 }
1397 1398
1398 void AddSearchEnginesStrings(content::WebUIDataSource* html_source) { 1399 void AddSearchEnginesStrings(content::WebUIDataSource* html_source) {
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
1852 #if defined(USE_NSS_CERTS) 1853 #if defined(USE_NSS_CERTS)
1853 AddCertificateManagerStrings(html_source); 1854 AddCertificateManagerStrings(html_source);
1854 #endif 1855 #endif
1855 1856
1856 policy_indicator::AddLocalizedStrings(html_source); 1857 policy_indicator::AddLocalizedStrings(html_source);
1857 1858
1858 html_source->SetJsonPath(kLocalizedStringsFile); 1859 html_source->SetJsonPath(kLocalizedStringsFile);
1859 } 1860 }
1860 1861
1861 } // namespace settings 1862 } // namespace settings
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698