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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 117433002: Remove installation of Chrome Frame. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: indentation fix and new unittest 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
« chrome/installer/setup/setup_main.cc ('K') | « chrome/installer/setup/setup_util_unittest.cc ('k') | chrome/installer/util/installer_state.cc » ('j') | chrome/installer/util/installer_state_unittest.cc » ('J')
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 fb3853384ae7a29912f1c8fd5d2848fb62b8fdd2..cc086f4055617e66bc6d224b9d5d9b5e042ffd98 100644
--- a/chrome/installer/util/browser_distribution.cc
+++ b/chrome/installer/util/browser_distribution.cc
@@ -59,12 +59,7 @@ bool IsChromeFrameModule() {
BrowserDistribution::Type GetCurrentDistributionType() {
// TODO(erikwright): If the app host is installed, but not Chrome, perhaps
// this should return CHROME_APP_HOST.
- static BrowserDistribution::Type type =
- (MasterPreferences::ForCurrentProcess().install_chrome_frame() ||
- IsChromeFrameModule()) ?
- BrowserDistribution::CHROME_FRAME :
- BrowserDistribution::CHROME_BROWSER;
- return type;
+ return BrowserDistribution::CHROME_BROWSER;
}
} // end namespace
« chrome/installer/setup/setup_main.cc ('K') | « chrome/installer/setup/setup_util_unittest.cc ('k') | chrome/installer/util/installer_state.cc » ('j') | chrome/installer/util/installer_state_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698