diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-22 14:11:12 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-22 14:11:12 +0000 |
| commit | 47bccaff0d1a6bf0175d563bec6affea6317993a (patch) | |
| tree | d108eeaf245b04def063e7dc4c929185ae50c377 | |
| parent | ecad7768a4f40e1ff1a6f1634d18a68358978cdb (diff) | |
| download | chromium_src-47bccaff0d1a6bf0175d563bec6affea6317993a.zip chromium_src-47bccaff0d1a6bf0175d563bec6affea6317993a.tar.gz chromium_src-47bccaff0d1a6bf0175d563bec6affea6317993a.tar.bz2 | |
Prevent displaying of automation protocol version mismatch errors for privileged instances of Chrome Frame.
BUG=None
TEST=None
Review URL: http://codereview.chromium.org/4031003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63508 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome_frame/chrome_frame_activex.cc | 3 | ||||
| -rw-r--r-- | chrome_frame/chrome_frame_npapi.cc | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/chrome_frame/chrome_frame_activex.cc b/chrome_frame/chrome_frame_activex.cc index 0d7d256..023bc7d 100644 --- a/chrome_frame/chrome_frame_activex.cc +++ b/chrome_frame/chrome_frame_activex.cc @@ -250,7 +250,8 @@ void ChromeFrameActivex::OnAutomationServerLaunchFailed( AutomationLaunchResult reason, const std::string& server_version) { Base::OnAutomationServerLaunchFailed(reason, server_version); - if (reason == AUTOMATION_VERSION_MISMATCH) { + // Do not display warnings for privileged instances of Chrome Frame. + if (reason == AUTOMATION_VERSION_MISMATCH && !is_privileged_) { DisplayVersionMismatchWarning(m_hWnd, server_version); } } diff --git a/chrome_frame/chrome_frame_npapi.cc b/chrome_frame/chrome_frame_npapi.cc index df55bf3..0a087b7 100644 --- a/chrome_frame/chrome_frame_npapi.cc +++ b/chrome_frame/chrome_frame_npapi.cc @@ -866,7 +866,8 @@ void ChromeFrameNPAPI::OnAutomationServerLaunchFailed( AutomationLaunchResult reason, const std::string& server_version) { SetReadyState(READYSTATE_UNINITIALIZED); - if (reason == AUTOMATION_VERSION_MISMATCH) { + // Do not display warnings for privileged instances of Chrome Frame. + if (reason == AUTOMATION_VERSION_MISMATCH && !is_privileged_) { DisplayVersionMismatchWarning(m_hWnd, server_version); } } |