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

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

Issue 115993006: Revert of Remove installation of Chrome Frame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/installer/setup/setup_util_unittest.cc ('k') | chrome/installer/util/installer_state.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/browser_distribution.cc
diff --git a/chrome/installer/util/browser_distribution.cc b/chrome/installer/util/browser_distribution.cc
index 60ff8c51a16a4ae01dce4fd9501d84def0c625bc..399d524032f1ff8eb329efdf0b034e6c36e6a1df 100644
--- a/chrome/installer/util/browser_distribution.cc
+++ b/chrome/installer/util/browser_distribution.cc
@@ -59,7 +59,12 @@
BrowserDistribution::Type GetCurrentDistributionType() {
// TODO(erikwright): If the app host is installed, but not Chrome, perhaps
// this should return CHROME_APP_HOST.
- return BrowserDistribution::CHROME_BROWSER;
+ static BrowserDistribution::Type type =
+ (MasterPreferences::ForCurrentProcess().install_chrome_frame() ||
+ IsChromeFrameModule()) ?
+ BrowserDistribution::CHROME_FRAME :
+ BrowserDistribution::CHROME_BROWSER;
+ return type;
}
} // end namespace
« no previous file with comments | « chrome/installer/setup/setup_util_unittest.cc ('k') | chrome/installer/util/installer_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698