Remove NPAPI support from Chrome Frame.

chrome_frame/utils.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_FRAME_UTILS_H_
 #define CHROME_FRAME_UTILS_H_
 
 #include <OAidl.h>
 #include <objidl.h>
 #include <windows.h>
@@ skipping 16 matching lines @@
 // utils.h : Various utility functions and classes
 
 extern const wchar_t kChromeContentPrefix[];
 extern const char kGCFProtocol[];
 extern const wchar_t kChromeProtocolPrefix[];
 extern const wchar_t kChromeFrameHeadlessMode[];
 extern const wchar_t kChromeFrameAccessibleMode[];
 extern const wchar_t kChromeFrameUnpinnedMode[];
 extern const wchar_t kAllowUnsafeURLs[];
 extern const wchar_t kEnableBuggyBhoIntercept[];
-extern const wchar_t kEnableFirefoxPrivilegeMode[];
 extern const wchar_t kChromeMimeType[];
 extern const wchar_t kChromeFrameAttachTabPattern[];
 extern const wchar_t kChromeFrameConfigKey[];
 extern const wchar_t kRenderInGCFUrlList[];
 extern const wchar_t kRenderInHostUrlList[];
 extern const wchar_t kEnableGCFRendererByDefault[];
 extern const wchar_t kIexploreProfileName[];
 extern const wchar_t kRundllProfileName[];
 
 // This function is very similar to the AtlRegisterTypeLib function except
@@ skipping 19 matching lines @@
 HRESULT UtilUnRegisterTypeLib(LPCWSTR typelib_path, bool for_current_user_only);
 
 HRESULT UtilRegisterTypeLib(ITypeLib* typelib,
                             LPCWSTR typelib_path,
                             LPCWSTR help_dir,
                             bool for_current_user_only);
 
 HRESULT UtilUnRegisterTypeLib(ITypeLib* typelib,
                               bool for_current_user_only);
 
-// Utility function to tell if the NPAPI plugin is registered.
-bool UtilIsNPAPIPluginRegistered();
-
-// Sets or clears a marker that causes NPAPI registration to persist across
-// updates. The marker is added if set is true and is deleted otherwise.
-bool UtilChangePersistentNPAPIMarker(bool set);
-
-// Returns true if the persistent NPAPI marker is set, false otherwise.
-bool UtilIsPersistentNPAPIMarkerSet();
+// Clears a marker that causes NPAPI registration to persist across updates.

[robertshield, 2011/06/28 20:49:35]

nit: causes *legacy* NPAPI registration

[grt (UTC plus 2), 2011/06/28 20:57:38]

Done.

+// Returns false if the marker could not be removed.
+bool UtilRemovePersistentNPAPIMarker();
 
 // Given an HTML fragment, this function looks for the
 // <meta http-equiv="X-UA-Compatible"> tag and extracts the value of the
 // "content" attribute
 // This method will currently return a false positive if the tag appears
 // inside a string in a <SCRIPT> block.
 HRESULT UtilGetXUACompatContentValue(const std::wstring& html_string,
                                      std::wstring* content_value);
 
 // Returns a string from ChromeFrame's string table by resource. Must be
@@ skipping 53 matching lines @@
 };
 
 // Retrieves the executable name of the process hosting us. If
 // |include_extension| is false, then we strip the extension from the name.
 std::wstring GetHostProcessName(bool include_extension);
 
 typedef enum BrowserType {
   BROWSER_INVALID = -1,
   BROWSER_UNKNOWN,
   BROWSER_IE,
-  BROWSER_FIREFOX,
-  BROWSER_OPERA,
 };
 
 BrowserType GetBrowserType();
 
 typedef enum IEVersion {
   IE_INVALID,
   NON_IE,
   IE_UNSUPPORTED,
   IE_6,
   IE_7,
@@ skipping 436 matching lines @@
 bool IsChromeFrameDocument(IWebBrowser2* web_browser);
 
 // Increases the wininet connection limit for HTTP 1.0/1.1 connections to the
 // value passed in. This is only done if the existing connection limit is
 // lesser than the connection limit passed in. This function attempts to
 // increase the connection count once per process.
 // Returns true on success.
 bool IncreaseWinInetConnections(DWORD connections);
 
 #endif  // CHROME_FRAME_UTILS_H_