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

Unified Diff: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

Issue 2616003002: Revert "[CUPS] Fix the browser crash in CUPS settings UI in guest mode." (Closed)
Patch Set: rebase Created 3 years, 11 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
« no previous file with comments | « chrome/browser/ui/webui/options/browser_options_handler.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
diff --git a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
index 67c9d72ad488d48e5a7aafc5d4f46fc29b630a7b..fdaf1906baff6952119440bae37311cf611a5254 100644
--- a/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
+++ b/chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc
@@ -1228,8 +1228,7 @@ void AddPeopleStrings(content::WebUIDataSource* html_source) {
ProfileShortcutManager::IsFeatureEnabled());
}
-void AddPrintingStrings(content::WebUIDataSource* html_source,
- Profile* profile) {
+void AddPrintingStrings(content::WebUIDataSource* html_source) {
LocalizedString localized_strings[] = {
{"printingPageTitle", IDS_SETTINGS_PRINTING},
{"printingCloudPrintLearnMoreLabel",
@@ -1310,8 +1309,7 @@ void AddPrintingStrings(content::WebUIDataSource* html_source,
#if defined(OS_CHROMEOS)
html_source->AddBoolean("showCupsPrintingFeatures",
base::CommandLine::ForCurrentProcess()->HasSwitch(
- ::switches::kEnableNativeCups) &&
- !profile->IsOffTheRecord());
+ ::switches::kEnableNativeCups));
#endif
}
@@ -1829,7 +1827,7 @@ void AddLocalizedStrings(content::WebUIDataSource* html_source,
AddOnStartupStrings(html_source);
AddPasswordsAndFormsStrings(html_source);
AddPeopleStrings(html_source);
- AddPrintingStrings(html_source, profile);
+ AddPrintingStrings(html_source);
AddPrivacyStrings(html_source, profile);
AddResetStrings(html_source);
AddSearchEnginesStrings(html_source);
« no previous file with comments | « chrome/browser/ui/webui/options/browser_options_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698