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

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

Issue 10246007: Fix GetAppShortcutName to return a localized name for Chrome (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | 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 <windows.h> 10 #include <windows.h>
(...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after
419 // want. Sigh. 419 // want. Sigh.
420 return L"Google Chrome"; 420 return L"Google Chrome";
421 } 421 }
422 422
423 std::wstring GoogleChromeDistribution::GetAlternateApplicationName() { 423 std::wstring GoogleChromeDistribution::GetAlternateApplicationName() {
424 const std::wstring& alt_product_name = 424 const std::wstring& alt_product_name =
425 installer::GetLocalizedString(IDS_OEM_MAIN_SHORTCUT_NAME_BASE); 425 installer::GetLocalizedString(IDS_OEM_MAIN_SHORTCUT_NAME_BASE);
426 return alt_product_name; 426 return alt_product_name;
427 } 427 }
428 428
429 std::wstring GoogleChromeDistribution::GetAppShortCutName() {
grt (UTC plus 2) 2012/04/27 13:00:25 same comment about ordering here.
430 const std::wstring& app_shortcut_name =
431 installer::GetLocalizedString(IDS_PRODUCT_NAME_BASE);
432 return app_shortcut_name;
433 }
434
429 std::wstring GoogleChromeDistribution::GetBrowserAppId() { 435 std::wstring GoogleChromeDistribution::GetBrowserAppId() {
430 return kBrowserAppId; 436 return kBrowserAppId;
431 } 437 }
432 438
433 std::wstring GoogleChromeDistribution::GetInstallSubDir() { 439 std::wstring GoogleChromeDistribution::GetInstallSubDir() {
434 std::wstring sub_dir(installer::kGoogleChromeInstallSubDir1); 440 std::wstring sub_dir(installer::kGoogleChromeInstallSubDir1);
435 sub_dir.append(L"\\"); 441 sub_dir.append(L"\\");
436 sub_dir.append(installer::kGoogleChromeInstallSubDir2); 442 sub_dir.append(installer::kGoogleChromeInstallSubDir2);
437 return sub_dir; 443 return sub_dir;
438 } 444 }
(...skipping 407 matching lines...) Expand 10 before | Expand all | Expand 10 after
846 // we waited for chrome to exit so the uninstall would not detect chrome 852 // we waited for chrome to exit so the uninstall would not detect chrome
847 // running. 853 // running.
848 bool system_level_toast = CommandLine::ForCurrentProcess()->HasSwitch( 854 bool system_level_toast = CommandLine::ForCurrentProcess()->HasSwitch(
849 installer::switches::kSystemLevelToast); 855 installer::switches::kSystemLevelToast);
850 856
851 CommandLine cmd(InstallUtil::GetChromeUninstallCmd(system_level_toast, 857 CommandLine cmd(InstallUtil::GetChromeUninstallCmd(system_level_toast,
852 GetType())); 858 GetType()));
853 base::LaunchProcess(cmd, base::LaunchOptions(), NULL); 859 base::LaunchProcess(cmd, base::LaunchOptions(), NULL);
854 } 860 }
855 #endif 861 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698