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

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

Issue 10446111: Abstract suffixing logic away from GetApplicationName (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase on suffix@r142211 Created 8 years, 6 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 | Annotate | Revision Log
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 397 matching lines...) Expand 10 before | Expand all | Expand 10 after
408 // process runs inside a Job object controlled by the shell. As long as there 408 // process runs inside a Job object controlled by the shell. As long as there
409 // are processes running, the shell will not close the uninstall applet. WMI 409 // are processes running, the shell will not close the uninstall applet. WMI
410 // allows us to escape from the Job object so the applet will close. 410 // allows us to escape from the Job object so the applet will close.
411 installer::WMIProcess::Launch(command, &pid); 411 installer::WMIProcess::Launch(command, &pid);
412 } 412 }
413 413
414 string16 GoogleChromeDistribution::GetAppGuid() { 414 string16 GoogleChromeDistribution::GetAppGuid() {
415 return product_guid(); 415 return product_guid();
416 } 416 }
417 417
418 string16 GoogleChromeDistribution::GetApplicationName() { 418 string16 GoogleChromeDistribution::GetBaseAppName() {
419 // I'd really like to return L ## PRODUCT_FULLNAME_STRING; but that's no good 419 // I'd really like to return L ## PRODUCT_FULLNAME_STRING; but that's no good
420 // since it'd be "Chromium" in a non-Chrome build, which isn't at all what I 420 // since it'd be "Chromium" in a non-Chrome build, which isn't at all what I
421 // want. Sigh. 421 // want. Sigh.
422 return L"Google Chrome"; 422 return L"Google Chrome";
423 } 423 }
424 424
425 string16 GoogleChromeDistribution::GetAppShortCutName() { 425 string16 GoogleChromeDistribution::GetAppShortCutName() {
426 const string16& app_shortcut_name = 426 const string16& app_shortcut_name =
427 installer::GetLocalizedString(IDS_PRODUCT_NAME_BASE); 427 installer::GetLocalizedString(IDS_PRODUCT_NAME_BASE);
428 return app_shortcut_name; 428 return app_shortcut_name;
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
850 // we waited for chrome to exit so the uninstall would not detect chrome 850 // we waited for chrome to exit so the uninstall would not detect chrome
851 // running. 851 // running.
852 bool system_level_toast = CommandLine::ForCurrentProcess()->HasSwitch( 852 bool system_level_toast = CommandLine::ForCurrentProcess()->HasSwitch(
853 installer::switches::kSystemLevelToast); 853 installer::switches::kSystemLevelToast);
854 854
855 CommandLine cmd(InstallUtil::GetChromeUninstallCmd(system_level_toast, 855 CommandLine cmd(InstallUtil::GetChromeUninstallCmd(system_level_toast,
856 GetType())); 856 GetType()));
857 base::LaunchProcess(cmd, base::LaunchOptions(), NULL); 857 base::LaunchProcess(cmd, base::LaunchOptions(), NULL);
858 } 858 }
859 #endif 859 #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