Adding a privileged callback used in IE CF to check whether to show...

chrome_frame/chrome_frame_npapi.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome_frame/chrome_frame_npapi.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/string_split.h"
@@ skipping 864 matching lines @@
     }
   }
 
   SetReadyState(READYSTATE_COMPLETE);
 }
 
 void ChromeFrameNPAPI::OnAutomationServerLaunchFailed(
     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);
   }
 }
 
 void ChromeFrameNPAPI::OnCloseTab(int tab_handle) {
   std::string arg;
   FireEvent("close", arg);
   ScopedNpVariant result;
   InvokeDefault(onclose_handler_, arg, &result);
@@ skipping 596 matching lines @@
 }
 
 int32 ChromeFrameNPAPI::Write(NPStream* stream, int32 offset, int32 len,
                               void* buffer) {
   return url_fetcher_.Write(stream, offset, len, buffer);
 }
 
 NPError ChromeFrameNPAPI::DestroyStream(NPStream* stream, NPReason reason) {
   return url_fetcher_.DestroyStream(stream, reason);
 }