Backed out changeset 5ecd639be1a4 (bug 1202087) for bustage

media/webrtc/trunk/webrtc/modules/desktop_capture/win/desktop_device_info_win.cc

@@ -7,7 +7,6 @@
 #include "webrtc/modules/desktop_capture/win/win_shared.h"
 #include <inttypes.h>
 #include <stdio.h>
-#include <VersionHelpers.h>
 
 // Duplicating declaration so that it always resolves in decltype use
 // typedef BOOL (WINAPI *QueryFullProcessImageNameProc)(HANDLE hProcess, DWORD dwFlags, LPTSTR lpExeName, PDWORD lpdwSize);
@@ -93,17 +92,6 @@ void DesktopDeviceInfoWin::InitializeApplicationList() {
       continue;
     }
 
-    // Win8 introduced "Modern Apps" whose associated window is
-    // non-shareable. We want to filter them out.
-    const int classLength = 256;
-    WCHAR class_name[classLength] = {0};
-    GetClassName(hWnd, class_name, classLength);
-    if (IsWindows8OrGreater() &&
-        (wcscmp(class_name, L"ApplicationFrameWindow") == 0 ||
-         wcscmp(class_name, L"Windows.UI.Core.CoreWindow") == 0)) {
-      continue;
-    }
-
     // filter out already-seen processes, after updating the window count
     DesktopApplicationList::iterator itr = desktop_application_list_.find(dwProcessId);
     if (itr != desktop_application_list_.end()) {

media/webrtc/trunk/webrtc/modules/desktop_capture/window_capturer_win.cc

@@ -11,7 +11,6 @@
 #include "webrtc/modules/desktop_capture/window_capturer.h"
 
 #include <assert.h>
-#include <VersionHelpers.h>
 
 #include "webrtc/base/scoped_ptr.h"
 #include "webrtc/base/win32.h"
@@ -50,14 +49,6 @@ BOOL CALLBACK WindowsEnumerationHandler(HWND hwnd, LPARAM param) {
   if (wcscmp(class_name, L"Progman") == 0 || wcscmp(class_name, L"Button") == 0)
     return TRUE;
 
-  // Win8 introduced "Modern Apps" whose associated window is
-  // non-shareable. We want to filter them out.
-  if (IsWindows8OrGreater() &&
-      (wcscmp(class_name, L"ApplicationFrameWindow") == 0 ||
-       wcscmp(class_name, L"Windows.UI.Core.CoreWindow") == 0)) {
-    return TRUE;
-  }
-
   WindowCapturer::Window window;
   window.id = reinterpret_cast<WindowCapturer::WindowId>(hwnd);