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

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

Issue 11359133: Add default icon to app_host.exe, and use it in shortcuts during installation. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Renaming GetChromiumIconString() => GetChromiumIconLocation(). Created 8 years, 1 month 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 specific implementation of BrowserDistribution class for 5 // This file defines specific implementation of BrowserDistribution class for
6 // Google Chrome. 6 // Google Chrome.
7 7
8 #include "chrome/installer/util/google_chrome_distribution.h" 8 #include "chrome/installer/util/google_chrome_distribution.h"
9 9
10 #include <vector> 10 #include <vector>
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after
531 L"Google Chrome"; 531 L"Google Chrome";
532 } 532 }
533 533
534 string16 GoogleChromeDistribution::GetVersionKey() { 534 string16 GoogleChromeDistribution::GetVersionKey() {
535 string16 key(google_update::kRegPathClients); 535 string16 key(google_update::kRegPathClients);
536 key.append(L"\\"); 536 key.append(L"\\");
537 key.append(product_guid()); 537 key.append(product_guid());
538 return key; 538 return key;
539 } 539 }
540 540
541 string16 GoogleChromeDistribution::GetIconFilename() {
542 return installer::kChromeExe;
543 }
544
541 bool GoogleChromeDistribution::GetCommandExecuteImplClsid( 545 bool GoogleChromeDistribution::GetCommandExecuteImplClsid(
542 string16* handler_class_uuid) { 546 string16* handler_class_uuid) {
543 if (handler_class_uuid) 547 if (handler_class_uuid)
544 *handler_class_uuid = kCommandExecuteImplUuid; 548 *handler_class_uuid = kCommandExecuteImplUuid;
545 return true; 549 return true;
546 } 550 }
547 551
548 // This method checks if we need to change "ap" key in Google Update to try 552 // This method checks if we need to change "ap" key in Google Update to try
549 // full installer as fall back method in case incremental installer fails. 553 // full installer as fall back method in case incremental installer fails.
550 // - If incremental installer fails we append a magic string ("-full"), if 554 // - If incremental installer fails we append a magic string ("-full"), if
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
862 // we waited for chrome to exit so the uninstall would not detect chrome 866 // we waited for chrome to exit so the uninstall would not detect chrome
863 // running. 867 // running.
864 bool system_level_toast = CommandLine::ForCurrentProcess()->HasSwitch( 868 bool system_level_toast = CommandLine::ForCurrentProcess()->HasSwitch(
865 installer::switches::kSystemLevelToast); 869 installer::switches::kSystemLevelToast);
866 870
867 CommandLine cmd(InstallUtil::GetChromeUninstallCmd(system_level_toast, 871 CommandLine cmd(InstallUtil::GetChromeUninstallCmd(system_level_toast,
868 GetType())); 872 GetType()));
869 base::LaunchProcess(cmd, base::LaunchOptions(), NULL); 873 base::LaunchProcess(cmd, base::LaunchOptions(), NULL);
870 } 874 }
871 #endif 875 #endif
OLDNEW
« no previous file with comments | « chrome/installer/util/google_chrome_distribution.h ('k') | chrome/installer/util/google_chrome_distribution_dummy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698