Set prop app id for chromium/application shortcut.

app/win_util.cc

 // Copyright (c) 2009 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 "app/win_util.h"
 
 #include <commdlg.h>
 #include <dwmapi.h>
-#include <propvarutil.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
 #include <algorithm>
 
 #include "app/gfx/codec/png_codec.h"
 #include "app/gfx/gdi_util.h"
 #include "app/l10n_util.h"
 #include "app/l10n_util_win.h"
 #include "base/base_switches.h"
@@ skipping 20 matching lines @@
 namespace {
 
 const wchar_t kShell32[] = L"shell32.dll";
 const char kSHGetPropertyStoreForWindow[] = "SHGetPropertyStoreForWindow";
 
 // Define the type of SHGetPropertyStoreForWindow is SHGPSFW.
 typedef DECLSPEC_IMPORT HRESULT (STDAPICALLTYPE *SHGPSFW)(HWND hwnd,
                                                           REFIID riid,
                                                           void** ppv);
 
-EXTERN_C const PROPERTYKEY DECLSPEC_SELECTANY PKEY_AppUserModel_ID =
-    { { 0x9F4C2855, 0x9F79, 0x4B39,
-    { 0xA8, 0xD0, 0xE1, 0xD4, 0x2D, 0xE1, 0xD5, 0xF3, } }, 5 };
-
 // Enforce visible dialog box.
 UINT_PTR CALLBACK SaveAsDialogHook(HWND dialog, UINT message,
                                    WPARAM wparam, LPARAM lparam) {
   static const UINT kPrivateMessage = 0x2F3F;
   switch (message) {
     case WM_INITDIALOG: {
       // Do nothing here. Just post a message to defer actual processing.
       PostMessage(dialog, kPrivateMessage, 0, 0);
       return TRUE;
     }
@@ skipping 783 matching lines @@
 
 gfx::Font GetWindowTitleFont() {
   NONCLIENTMETRICS ncm;
   win_util::GetNonClientMetrics(&ncm);
   l10n_util::AdjustUIFont(&(ncm.lfCaptionFont));
   ScopedHFONT caption_font(CreateFontIndirect(&(ncm.lfCaptionFont)));
   return gfx::Font::CreateFont(caption_font);
 }
 
 void SetAppIdForWindow(const std::wstring& app_id, HWND hwnd) {
-  // This funcationality is only available on Win7+.
+  // This functionality is only available on Win7+.
   if (win_util::GetWinVersion() != win_util::WINVERSION_WIN7)
     return;
 
   // Load Shell32.dll into memory.
   // TODO(brg): Remove this mechanism when the Win7 SDK is available in trunk.
   std::wstring shell32_filename(kShell32);
   FilePath shell32_filepath(shell32_filename);
   base::NativeLibrary shell32_library = base::LoadNativeLibrary(
       shell32_filepath);
 
   if (!shell32_library)
     return;
 
   // Get the function pointer for SHGetPropertyStoreForWindow.
   void* function = base::GetFunctionPointerFromNativeLibrary(
       shell32_library,
       kSHGetPropertyStoreForWindow);
 
   if (!function) {
     base::UnloadNativeLibrary(shell32_library);
     return;
   }
 
   // Set the application's name.
-  PROPVARIANT pv;
-  InitPropVariantFromString(app_id.c_str(), &pv);
-
   ScopedComPtr<IPropertyStore> pps;
   SHGPSFW SHGetPropertyStoreForWindow = static_cast<SHGPSFW>(function);
   HRESULT result = SHGetPropertyStoreForWindow(
       hwnd, __uuidof(*pps), reinterpret_cast<void**>(pps.Receive()));
   if (S_OK == result) {
-    if (S_OK == pps->SetValue(PKEY_AppUserModel_ID, pv))
-      pps->Commit();
+    SetAppIdForPropertyStore(pps, app_id.c_str());
   }
 
   // Cleanup.
-  PropVariantClear(&pv);
   base::UnloadNativeLibrary(shell32_library);
 }
 
 }  // namespace win_util