From 74d1eecc72f97cb759ea252d8838f5ee46670938 Mon Sep 17 00:00:00 2001 From: "robertshield@chromium.org" Date: Wed, 4 Nov 2009 22:18:57 +0000 Subject: Continue to remove CHROME_FRAME_BUILD define from code that goes into chrome.dll. This reworks the browser distribution code to use the ChromeFrameBrowserDistribution iff --chrome-frame is present on the command line. Also, * At startup, chrome.exe now uses the BrowserDistribution code to determine where the Chromium version key resides (instead of hard coding it). * The installer now propagates the presence of --verbose-logging to uninstalls. * The chrome_launcher now allows the --chrome-frame switch through to chrome. * The installer now accepts a --chrome-frame switch. * Remove almost all occurences of the CHROME_FRAME_BUILD define from the installer. BUG=26012, 26603 TEST=Chrome Frame still builds and runs correctly. Chrome Frame builds built without 'branding'='Chrome' now install correctly. Review URL: http://codereview.chromium.org/345021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31015 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome_frame/chrome_launcher.cc | 1 + 1 file changed, 1 insertion(+) (limited to 'chrome_frame/chrome_launcher.cc') diff --git a/chrome_frame/chrome_launcher.cc b/chrome_frame/chrome_launcher.cc index af35481..731ff04 100644 --- a/chrome_frame/chrome_launcher.cc +++ b/chrome_frame/chrome_launcher.cc @@ -21,6 +21,7 @@ const wchar_t kLauncherExeBaseName[] = L"chrome_launcher.exe"; // safe-for-Low-Integrity version of the Chrome command line. const char* kAllowedSwitches[] = { switches::kAutomationClientChannelID, + switches::kChromeFrame, switches::kDisableMetrics, switches::kEnableRendererAccessibility, switches::kEnableExperimentalExtensionApis, -- cgit v1.1