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

Side by Side Diff: base/win/shortcut.cc

Issue 1124763003: Update from https://crrev.com/327068 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: update nacl, buildtools, fix display_change_notifier_unittest Created 5 years, 7 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/win/shortcut.h" 5 #include "base/win/shortcut.h"
6 6
7 #include <shellapi.h> 7 #include <shellapi.h>
8 #include <shlobj.h> 8 #include <shlobj.h>
9 #include <propkey.h> 9 #include <propkey.h>
10 10
(...skipping 24 matching lines...) Expand all
35 CLSCTX_INPROC_SERVER)) || 35 CLSCTX_INPROC_SERVER)) ||
36 FAILED(i_persist_file->QueryFrom(i_shell_link->get())) || 36 FAILED(i_persist_file->QueryFrom(i_shell_link->get())) ||
37 (shortcut && FAILED((*i_persist_file)->Load(shortcut, STGM_READWRITE)))) { 37 (shortcut && FAILED((*i_persist_file)->Load(shortcut, STGM_READWRITE)))) {
38 i_shell_link->Release(); 38 i_shell_link->Release();
39 i_persist_file->Release(); 39 i_persist_file->Release();
40 } 40 }
41 } 41 }
42 42
43 } // namespace 43 } // namespace
44 44
45 ShortcutProperties::ShortcutProperties()
46 : icon_index(-1), dual_mode(false), options(0U) {
47 }
48
49 ShortcutProperties::~ShortcutProperties() {
50 }
51
45 bool CreateOrUpdateShortcutLink(const FilePath& shortcut_path, 52 bool CreateOrUpdateShortcutLink(const FilePath& shortcut_path,
46 const ShortcutProperties& properties, 53 const ShortcutProperties& properties,
47 ShortcutOperation operation) { 54 ShortcutOperation operation) {
48 base::ThreadRestrictions::AssertIOAllowed(); 55 base::ThreadRestrictions::AssertIOAllowed();
49 56
50 // A target is required unless |operation| is SHORTCUT_UPDATE_EXISTING. 57 // A target is required unless |operation| is SHORTCUT_UPDATE_EXISTING.
51 if (operation != SHORTCUT_UPDATE_EXISTING && 58 if (operation != SHORTCUT_UPDATE_EXISTING &&
52 !(properties.options & ShortcutProperties::PROPERTIES_TARGET)) { 59 !(properties.options & ShortcutProperties::PROPERTIES_TARGET)) {
53 NOTREACHED(); 60 NOTREACHED();
54 return false; 61 return false;
(...skipping 271 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 if (GetVersion() < VERSION_WIN7) 333 if (GetVersion() < VERSION_WIN7)
327 return false; 334 return false;
328 335
329 int result = reinterpret_cast<int>(ShellExecute(NULL, L"taskbarunpin", 336 int result = reinterpret_cast<int>(ShellExecute(NULL, L"taskbarunpin",
330 shortcut, NULL, NULL, 0)); 337 shortcut, NULL, NULL, 0));
331 return result > 32; 338 return result > 32;
332 } 339 }
333 340
334 } // namespace win 341 } // namespace win
335 } // namespace base 342 } // namespace base
OLDNEW
« no previous file with comments | « base/win/shortcut.h ('k') | base/win/shortcut_unittest.cc » ('j') | mojo/public/tools/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698