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

Unified Diff: chrome/installer/util/firewall_manager_win.cc

Issue 2791593002: Allow installer::GetLocalizedString to return mode-specific strings. (Closed)
Patch Set: manzagop review part the deux Created 3 years, 9 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/installer/util/browser_distribution.cc ('k') | chrome/installer/util/google_chrome_distribution.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/firewall_manager_win.cc
diff --git a/chrome/installer/util/firewall_manager_win.cc b/chrome/installer/util/firewall_manager_win.cc
index 14f387a9d8c4f24817bdffd8095e61e6d1886f12..c92301ee106249fcc83e57a67b92554674451b78 100644
--- a/chrome/installer/util/firewall_manager_win.cc
+++ b/chrome/installer/util/firewall_manager_win.cc
@@ -13,7 +13,6 @@
#include "base/strings/string16.h"
#include "chrome/installer/util/advanced_firewall_manager_win.h"
#include "chrome/installer/util/browser_distribution.h"
-#include "chrome/installer/util/install_util.h"
#include "chrome/installer/util/installer_util_strings.h"
#include "chrome/installer/util/l10n_string_util.h"
#include "chrome/installer/util/legacy_firewall_manager_win.h"
@@ -49,19 +48,11 @@ class FirewallManagerAdvancedImpl : public FirewallManager {
private:
static base::string16 GetMdnsRuleName() {
-#if defined(GOOGLE_CHROME_BUILD)
- if (InstallUtil::IsChromeSxSProcess())
- return GetLocalizedString(IDS_INBOUND_MDNS_RULE_NAME_CANARY_BASE);
-#endif
return GetLocalizedString(IDS_INBOUND_MDNS_RULE_NAME_BASE);
}
static base::string16 GetMdnsRuleDescription() {
-#if defined(GOOGLE_CHROME_BUILD)
- if (InstallUtil::IsChromeSxSProcess())
- return GetLocalizedString(IDS_INBOUND_MDNS_RULE_DESCRIPTION_CANARY_BASE);
-#endif
- return GetLocalizedString(IDS_INBOUND_MDNS_RULE_DESCRIPTION_BASE);
+ return GetLocalizedString(IDS_INBOUND_MDNS_RULE_DESCRIPTION_BASE);
}
AdvancedFirewallManager manager_;
« no previous file with comments | « chrome/installer/util/browser_distribution.cc ('k') | chrome/installer/util/google_chrome_distribution.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698