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

Side by Side Diff: chrome/installer/util/shell_util.cc

Issue 1111613002: chrome/installer/util: Fix warnings found by clang chromium-style plugin on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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
« no previous file with comments | « chrome/installer/util/shell_util.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 // This file defines functions that integrate Chrome in Windows shell. These 5 // This file defines functions that integrate Chrome in Windows shell. These
6 // functions can be used by Chrome as well as Chrome installer. All of the 6 // functions can be used by Chrome as well as Chrome installer. All of the
7 // work is done by the local functions defined in anonymous namespace in 7 // work is done by the local functions defined in anonymous namespace in
8 // this class. 8 // this class.
9 9
10 #include "chrome/installer/util/shell_util.h" 10 #include "chrome/installer/util/shell_util.h"
(...skipping 1550 matching lines...) Expand 10 before | Expand all | Expand 10 after
1561 const wchar_t* ShellUtil::kRegApplicationIcon = L"ApplicationIcon"; 1561 const wchar_t* ShellUtil::kRegApplicationIcon = L"ApplicationIcon";
1562 const wchar_t* ShellUtil::kRegApplicationCompany = L"ApplicationCompany"; 1562 const wchar_t* ShellUtil::kRegApplicationCompany = L"ApplicationCompany";
1563 const wchar_t* ShellUtil::kRegExePath = L"\\.exe"; 1563 const wchar_t* ShellUtil::kRegExePath = L"\\.exe";
1564 const wchar_t* ShellUtil::kRegVerbOpen = L"open"; 1564 const wchar_t* ShellUtil::kRegVerbOpen = L"open";
1565 const wchar_t* ShellUtil::kRegVerbOpenNewWindow = L"opennewwindow"; 1565 const wchar_t* ShellUtil::kRegVerbOpenNewWindow = L"opennewwindow";
1566 const wchar_t* ShellUtil::kRegVerbRun = L"run"; 1566 const wchar_t* ShellUtil::kRegVerbRun = L"run";
1567 const wchar_t* ShellUtil::kRegCommand = L"command"; 1567 const wchar_t* ShellUtil::kRegCommand = L"command";
1568 const wchar_t* ShellUtil::kRegDelegateExecute = L"DelegateExecute"; 1568 const wchar_t* ShellUtil::kRegDelegateExecute = L"DelegateExecute";
1569 const wchar_t* ShellUtil::kRegOpenWithProgids = L"OpenWithProgids"; 1569 const wchar_t* ShellUtil::kRegOpenWithProgids = L"OpenWithProgids";
1570 1570
1571 ShellUtil::ShortcutProperties::ShortcutProperties(ShellChange level_in)
1572 : level(level_in),
1573 icon_index(0),
1574 dual_mode(false),
1575 pin_to_taskbar(false),
1576 options(0U) {
1577 }
1578
1579 ShellUtil::ShortcutProperties::~ShortcutProperties() {
1580 }
1581
1571 bool ShellUtil::QuickIsChromeRegisteredInHKLM(BrowserDistribution* dist, 1582 bool ShellUtil::QuickIsChromeRegisteredInHKLM(BrowserDistribution* dist,
1572 const base::FilePath& chrome_exe, 1583 const base::FilePath& chrome_exe,
1573 const base::string16& suffix) { 1584 const base::string16& suffix) {
1574 return QuickIsChromeRegistered(dist, chrome_exe, suffix, 1585 return QuickIsChromeRegistered(dist, chrome_exe, suffix,
1575 CONFIRM_SHELL_REGISTRATION_IN_HKLM); 1586 CONFIRM_SHELL_REGISTRATION_IN_HKLM);
1576 } 1587 }
1577 1588
1578 bool ShellUtil::ShortcutLocationIsSupported( 1589 bool ShellUtil::ShortcutLocationIsSupported(
1579 ShellUtil::ShortcutLocation location) { 1590 ShellUtil::ShortcutLocation location) {
1580 switch (location) { 1591 switch (location) {
(...skipping 889 matching lines...) Expand 10 before | Expand all | Expand 10 after
2470 base::string16 key_path(ShellUtil::kRegClasses); 2481 base::string16 key_path(ShellUtil::kRegClasses);
2471 key_path.push_back(base::FilePath::kSeparators[0]); 2482 key_path.push_back(base::FilePath::kSeparators[0]);
2472 key_path.append(prog_id); 2483 key_path.append(prog_id);
2473 return InstallUtil::DeleteRegistryKey( 2484 return InstallUtil::DeleteRegistryKey(
2474 HKEY_CURRENT_USER, key_path, WorkItem::kWow64Default); 2485 HKEY_CURRENT_USER, key_path, WorkItem::kWow64Default);
2475 2486
2476 // TODO(mgiuca): Remove the extension association entries. This requires that 2487 // TODO(mgiuca): Remove the extension association entries. This requires that
2477 // the extensions associated with a particular prog_id are stored in that 2488 // the extensions associated with a particular prog_id are stored in that
2478 // prog_id's key. 2489 // prog_id's key.
2479 } 2490 }
OLDNEW
« no previous file with comments | « chrome/installer/util/shell_util.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698