diff options
| author | slightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-26 23:54:34 +0000 |
|---|---|---|
| committer | slightlyoff@chromium.org <slightlyoff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-26 23:54:34 +0000 |
| commit | 11903b0dd26e51563e0645af2e900649ac028408 (patch) | |
| tree | e544522a8295325407938d998b09a8dcc996ea03 /chrome_frame/utils.cc | |
| parent | 5607c4eb42ea5b5f153b7dfcbe0dddd08cf1aa4e (diff) | |
| download | chromium_src-11903b0dd26e51563e0645af2e900649ac028408.zip chromium_src-11903b0dd26e51563e0645af2e900649ac028408.tar.gz chromium_src-11903b0dd26e51563e0645af2e900649ac028408.tar.bz2 | |
Fixes GCF perf tests in prep for re-enabling them on the bots.
BUG=36734
TEST=build/run chrome_frame_perftests.exe, note that they all run now
Review URL: http://codereview.chromium.org/1433002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42870 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/utils.cc')
| -rw-r--r-- | chrome_frame/utils.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc index 85d4880..3065c54 100644 --- a/chrome_frame/utils.cc +++ b/chrome_frame/utils.cc @@ -61,6 +61,10 @@ const wchar_t kChromeAttachExternalTabPrefix[] = L"attach_external_tab"; // are handled by the chrome test crash server. const wchar_t kChromeFrameHeadlessMode[] = L"ChromeFrameHeadlessMode"; +// Indicates that we are running in an environment that wishes to avoid +// DLL pinning, such as the perf tests. +const wchar_t kChromeFrameUnpinnedMode[] = L"kChromeFrameUnpinnedMode"; + // {1AF32B6C-A3BA-48B9-B24E-8AA9C41F6ECD} static const IID IID_IWebBrowserPriv2IE7 = { 0x1AF32B6C, 0xA3BA, 0x48B9, { 0xB2, 0x4E, 0x8A, 0xA9, 0xC4, 0x1F, 0x6E, 0xCD } }; @@ -879,6 +883,11 @@ bool IsHeadlessMode() { return headless; } +bool IsUnpinnedMode() { + bool unpinned = GetConfigBool(false, kChromeFrameUnpinnedMode); + return unpinned; +} + std::wstring GetActualUrlFromMoniker(IMoniker* moniker, IBindCtx* bind_context, const std::wstring& bho_url) { |