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

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

Issue 1321143002: Make GetCommandExecuteImplClsid return the CLSID as a string directly. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@a1_no_delegate_execute_win10
Patch Set: review:grt Created 5 years, 3 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 // 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 318 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 dist, InstallUtil::IsPerUserInstall(chrome_exe)); 329 dist, InstallUtil::IsPerUserInstall(chrome_exe));
330 330
331 // TODO(grt): http://crbug.com/75152 Write a reference to a localized 331 // TODO(grt): http://crbug.com/75152 Write a reference to a localized
332 // resource for name, description, and company. 332 // resource for name, description, and company.
333 app_info.application_name = dist->GetDisplayName(); 333 app_info.application_name = dist->GetDisplayName();
334 app_info.application_icon_path = chrome_exe; 334 app_info.application_icon_path = chrome_exe;
335 app_info.application_icon_index = chrome_icon_index; 335 app_info.application_icon_index = chrome_icon_index;
336 app_info.application_description = dist->GetAppDescription(); 336 app_info.application_description = dist->GetAppDescription();
337 app_info.publisher_name = dist->GetPublisherName(); 337 app_info.publisher_name = dist->GetPublisherName();
338 338
339 dist->GetCommandExecuteImplClsid(&app_info.delegate_clsid); 339 app_info.delegate_clsid = dist->GetCommandExecuteImplClsid();
340 340
341 GetProgIdEntries(app_info, entries); 341 GetProgIdEntries(app_info, entries);
342 342
343 if (!app_info.delegate_clsid.empty()) { 343 if (!app_info.delegate_clsid.empty()) {
344 ScopedVector<RegistryEntry> delegate_execute_entries = 344 ScopedVector<RegistryEntry> delegate_execute_entries =
345 GetChromeDelegateExecuteEntries(chrome_exe, app_info); 345 GetChromeDelegateExecuteEntries(chrome_exe, app_info);
346 if (!IsChromeMetroSupported()) { 346 if (!IsChromeMetroSupported()) {
347 // Remove the keys (not only their values) so that Windows will continue 347 // Remove the keys (not only their values) so that Windows will continue
348 // to launch Chrome without a pesky association error. 348 // to launch Chrome without a pesky association error.
349 for (RegistryEntry* entry : delegate_execute_entries) 349 for (RegistryEntry* entry : delegate_execute_entries)
(...skipping 2215 matching lines...) Expand 10 before | Expand all | Expand 10 after
2565 base::string16 key_path(ShellUtil::kRegClasses); 2565 base::string16 key_path(ShellUtil::kRegClasses);
2566 key_path.push_back(base::FilePath::kSeparators[0]); 2566 key_path.push_back(base::FilePath::kSeparators[0]);
2567 key_path.append(prog_id); 2567 key_path.append(prog_id);
2568 return InstallUtil::DeleteRegistryKey( 2568 return InstallUtil::DeleteRegistryKey(
2569 HKEY_CURRENT_USER, key_path, WorkItem::kWow64Default); 2569 HKEY_CURRENT_USER, key_path, WorkItem::kWow64Default);
2570 2570
2571 // TODO(mgiuca): Remove the extension association entries. This requires that 2571 // TODO(mgiuca): Remove the extension association entries. This requires that
2572 // the extensions associated with a particular prog_id are stored in that 2572 // the extensions associated with a particular prog_id are stored in that
2573 // prog_id's key. 2573 // prog_id's key.
2574 } 2574 }
OLDNEW
« no previous file with comments | « chrome/installer/util/google_chrome_sxs_distribution.cc ('k') | win8/delegate_execute/delegate_execute.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698