Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(673)

Unified Diff: chrome_frame/chrome_frame_npapi.cc

Issue 4563001: Adding a privileged callback used in IE CF to check whether to show... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/chrome_frame_activex.cc ('k') | chrome_frame/chrome_tab.idl » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/chrome_frame_npapi.cc
===================================================================
--- chrome_frame/chrome_frame_npapi.cc (revision 65052)
+++ chrome_frame/chrome_frame_npapi.cc (working copy)
@@ -882,8 +882,12 @@
AutomationLaunchResult reason, const std::string& server_version) {
SetReadyState(READYSTATE_UNINITIALIZED);
- // Do not display warnings for privileged instances of Chrome Frame.
- if (reason == AUTOMATION_VERSION_MISMATCH && !is_privileged_) {
+ // In IE, we don't display warnings for privileged CF instances because
+ // there are 2 CFs created for each tab (so we decide on the CEEE side
+ // whether to show a warning). In FF however, there is only one privileged
+ // CF instance per Firefox window, so OK to show the warning there without
+ // any further logic.
+ if (reason == AUTOMATION_VERSION_MISMATCH) {
THREAD_SAFE_UMA_HISTOGRAM_COUNTS("ChromeFrame.VersionMismatchDisplayed", 1);
DisplayVersionMismatchWarning(m_hWnd, server_version);
}
« no previous file with comments | « chrome_frame/chrome_frame_activex.cc ('k') | chrome_frame/chrome_tab.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698