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

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

Issue 10542031: Suffix Chrome's appid on user-level installs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase to r142814 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 416 matching lines...) Expand 10 before | Expand all | Expand 10 after
427 installer::GetLocalizedString(IDS_PRODUCT_NAME_BASE); 427 installer::GetLocalizedString(IDS_PRODUCT_NAME_BASE);
428 return app_shortcut_name; 428 return app_shortcut_name;
429 } 429 }
430 430
431 string16 GoogleChromeDistribution::GetAlternateApplicationName() { 431 string16 GoogleChromeDistribution::GetAlternateApplicationName() {
432 const string16& alt_product_name = 432 const string16& alt_product_name =
433 installer::GetLocalizedString(IDS_OEM_MAIN_SHORTCUT_NAME_BASE); 433 installer::GetLocalizedString(IDS_OEM_MAIN_SHORTCUT_NAME_BASE);
434 return alt_product_name; 434 return alt_product_name;
435 } 435 }
436 436
437 string16 GoogleChromeDistribution::GetBrowserAppId() { 437 string16 GoogleChromeDistribution::GetBaseAppId() {
438 return kBrowserAppId; 438 return kBrowserAppId;
439 } 439 }
440 440
441 string16 GoogleChromeDistribution::GetInstallSubDir() { 441 string16 GoogleChromeDistribution::GetInstallSubDir() {
442 string16 sub_dir(installer::kGoogleChromeInstallSubDir1); 442 string16 sub_dir(installer::kGoogleChromeInstallSubDir1);
443 sub_dir.append(L"\\"); 443 sub_dir.append(L"\\");
444 sub_dir.append(installer::kGoogleChromeInstallSubDir2); 444 sub_dir.append(installer::kGoogleChromeInstallSubDir2);
445 return sub_dir; 445 return sub_dir;
446 } 446 }
447 447
(...skipping 402 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