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

chrome_frame/chrome_frame_activex.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_activex.h"
 
 #include <wininet.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 228 matching lines @@
     Fire_onmessage(message_event);
 
     FireEvent(onmessage_, message_event);
 
     base::win::ScopedVariant event_var;
     event_var.Set(static_cast<IDispatch*>(message_event));
     InvokeScriptFunction(onmessage_handler_, event_var.AsInput());
   }
 }
 
+bool ChromeFrameActivex::ShouldShowVersionMismatchDialog(
+    bool is_privileged,
+    IOleClientSite* client_site) {
+  if (!is_privileged) {
+    return true;
+  }
+
+  if (client_site) {
+    ScopedComPtr<IChromeFramePrivileged> service;
+    HRESULT hr = DoQueryService(SID_ChromeFramePrivileged,
+                                client_site,
+                                service.Receive());
+    if (SUCCEEDED(hr) && service) {
+      return (S_FALSE != service->ShouldShowVersionMismatchDialog());
+    }
+  }
+
+  NOTREACHED();
+  return true;
+}
+
 void ChromeFrameActivex::OnAutomationServerLaunchFailed(
     AutomationLaunchResult reason, const std::string& server_version) {
   Base::OnAutomationServerLaunchFailed(reason, server_version);
 
-  // Do not display warnings for privileged instances of Chrome Frame.
-  if (reason == AUTOMATION_VERSION_MISMATCH && !is_privileged_) {
-    THREAD_SAFE_UMA_HISTOGRAM_COUNTS("ChromeFrame.VersionMismatchDisplayed", 1);
+  if (reason == AUTOMATION_VERSION_MISMATCH &&
+      ShouldShowVersionMismatchDialog(is_privileged_, m_spClientSite)) {
+    THREAD_SAFE_UMA_HISTOGRAM_COUNTS(
+        "ChromeFrame.VersionMismatchDisplayed", 1);
     DisplayVersionMismatchWarning(m_hWnd, server_version);
   }
 }
 
 void ChromeFrameActivex::OnExtensionInstalled(
     const FilePath& path,
     void* user_data,
     AutomationMsg_ExtensionResponseValues response) {
   base::win::ScopedBstr path_str(path.value().c_str());
   Fire_onextensionready(path_str, response);
@@ skipping 398 matching lines @@
   if (FAILED(hr)) {
     NOTREACHED() << "ChromeFrame BHO SetSite failed. Error:"
                  << base::StringPrintf(" 0x%08X", hr);
     return hr;
   }
 
   web_browser2->PutProperty(base::win::ScopedBstr(bho_class_id_as_string),
                             base::win::ScopedVariant(bho));
   return S_OK;
 }