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

Unified Diff: chrome/browser/ui/views/tabs/window_finder_win.cc

Issue 1390923002: Revert of win: Update to Win 10 SDK (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 months 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 | « build/vs_toolchain.py ('k') | third_party/usrsctp/usrsctp.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/tabs/window_finder_win.cc
diff --git a/chrome/browser/ui/views/tabs/window_finder_win.cc b/chrome/browser/ui/views/tabs/window_finder_win.cc
index d08a039328b7c2ce6a164feeedf5d3bb759b43a0..2596c1888f35fef411b22f461b05a9ef1c421ef9 100644
--- a/chrome/browser/ui/views/tabs/window_finder_win.cc
+++ b/chrome/browser/ui/views/tabs/window_finder_win.cc
@@ -3,8 +3,6 @@
// found in the LICENSE file.
#include "chrome/browser/ui/views/tabs/window_finder.h"
-
-#include <shobjidl.h>
#include "base/win/scoped_gdi_object.h"
#include "base/win/windows_version.h"
@@ -151,6 +149,29 @@
};
// LocalProcessWindowFinder ---------------------------------------------------
+
+// Copied from ShObjIdl.h in 10.0.10240.0 SDK. This can be removed once we
+// update to the newer SDK.
+#if NTDDI_VERSION < 0x0A000000
+class DECLSPEC_UUID("aa509086-5ca9-4c25-8f95-589d3c07b48a")
+ VirtualDesktopManager;
+
+MIDL_INTERFACE("a5cd92ff-29be-454c-8d04-d82879fb3f1b")
+IVirtualDesktopManager : public IUnknown {
+ public:
+ virtual HRESULT STDMETHODCALLTYPE IsWindowOnCurrentVirtualDesktop(
+ /* [in] */ __RPC__in HWND topLevelWindow,
+ /* [out] */ __RPC__out BOOL * onCurrentDesktop) = 0;
+
+ virtual HRESULT STDMETHODCALLTYPE GetWindowDesktopId(
+ /* [in] */ __RPC__in HWND topLevelWindow,
+ /* [out] */ __RPC__out GUID * desktopId) = 0;
+
+ virtual HRESULT STDMETHODCALLTYPE MoveWindowToDesktop(
+ /* [in] */ __RPC__in HWND topLevelWindow,
+ /* [in] */ __RPC__in REFGUID desktopId) = 0;
+};
+#endif // NTDDI_VERSION < 0x0A000000
// Helper class to determine if a particular point contains a window from our
// process.
« no previous file with comments | « build/vs_toolchain.py ('k') | third_party/usrsctp/usrsctp.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698