| 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
|
|
|