diff options
| author | slightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-15 02:49:42 +0000 |
|---|---|---|
| committer | slightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-15 02:49:42 +0000 |
| commit | 4083afc6b0c957439e992a5f50daccac251a8162 (patch) | |
| tree | 1ae38734c76df0641bfbc848bf54a629a2a8d33f /chrome_frame | |
| parent | 7c37a7b1ae7ff1df70303891757b09288a5ec743 (diff) | |
| download | chromium_src-4083afc6b0c957439e992a5f50daccac251a8162.zip chromium_src-4083afc6b0c957439e992a5f50daccac251a8162.tar.gz chromium_src-4083afc6b0c957439e992a5f50daccac251a8162.tar.bz2 | |
Updates the launcher location finding logic to skip chrome_launcher.exe on OSes where IE can't run with differing integrities.
BUG=41572
TEST=None
Review URL: http://codereview.chromium.org/1638013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44613 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_launcher.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome_frame/chrome_launcher.cc b/chrome_frame/chrome_launcher.cc index 7646a66..2960c8e 100644 --- a/chrome_frame/chrome_launcher.cc +++ b/chrome_frame/chrome_launcher.cc @@ -9,6 +9,7 @@ #include "base/file_util.h" #include "base/logging.h" #include "base/path_service.h" +#include "base/win_util.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome_frame/chrome_frame_automation.h" @@ -24,6 +25,7 @@ const char* kAllowedSwitches[] = { switches::kChromeFrame, switches::kEnableRendererAccessibility, switches::kEnableExperimentalExtensionApis, + switches::kNoDefaultBrowserCheck, switches::kNoErrorDialogs, switches::kNoFirstRun, switches::kUserDataDir, @@ -32,8 +34,10 @@ const char* kAllowedSwitches[] = { }; CommandLine* CreateLaunchCommandLine() { - // TODO(joi) As optimization, could launch Chrome directly when running at - // medium integrity. (Requires bringing in code to read SIDs, etc.) + // Shortcut for OS versions that don't need the integrity broker. + if (win_util::GetWinVersion() < win_util::WINVERSION_VISTA) { + return new CommandLine(GetChromeExecutablePath()); + } // The launcher EXE will be in the same directory as the Chrome Frame DLL, // so create a full path to it based on this assumption. Since our unit |