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

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

Issue 2779893005: Continue to clean c_str() calls. (Closed)
Patch Set: Revert changes in font_service_app.cc Created 3 years, 8 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
« no previous file with comments | « chrome/common/trace_event_args_whitelist.cc ('k') | chrome/installer/util/user_experiment.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 30 matching lines...) Expand all
41 41
42 const wchar_t kChromeGuid[] = L"{8A69D345-D564-463c-AFF1-A69D9E530F96}"; 42 const wchar_t kChromeGuid[] = L"{8A69D345-D564-463c-AFF1-A69D9E530F96}";
43 43
44 // Substitute the locale parameter in uninstall URL with whatever 44 // Substitute the locale parameter in uninstall URL with whatever
45 // Google Update tells us is the locale. In case we fail to find 45 // Google Update tells us is the locale. In case we fail to find
46 // the locale, we use US English. 46 // the locale, we use US English.
47 base::string16 LocalizeUrl(const wchar_t* url) { 47 base::string16 LocalizeUrl(const wchar_t* url) {
48 base::string16 language; 48 base::string16 language;
49 if (!GoogleUpdateSettings::GetLanguage(&language)) 49 if (!GoogleUpdateSettings::GetLanguage(&language))
50 language = L"en-US"; // Default to US English. 50 language = L"en-US"; // Default to US English.
51 return base::ReplaceStringPlaceholders(url, language.c_str(), NULL); 51 return base::ReplaceStringPlaceholders(url, language, NULL);
52 } 52 }
53 53
54 base::string16 GetUninstallSurveyUrl() { 54 base::string16 GetUninstallSurveyUrl() {
55 const wchar_t kSurveyUrl[] = L"https://support.google.com/chrome/" 55 const wchar_t kSurveyUrl[] = L"https://support.google.com/chrome/"
56 L"contact/chromeuninstall3?hl=$1"; 56 L"contact/chromeuninstall3?hl=$1";
57 return LocalizeUrl(kSurveyUrl); 57 return LocalizeUrl(kSurveyUrl);
58 } 58 }
59 59
60 bool NavigateToUrlWithEdge(const base::string16& url) { 60 bool NavigateToUrlWithEdge(const base::string16& url) {
61 base::string16 protocol_url = L"microsoft-edge:" + url; 61 base::string16 protocol_url = L"microsoft-edge:" + url;
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
237 installer::InstallStatus install_status) { 237 installer::InstallStatus install_status) {
238 GoogleUpdateSettings::UpdateInstallStatus( 238 GoogleUpdateSettings::UpdateInstallStatus(
239 system_install, archive_type, 239 system_install, archive_type,
240 InstallUtil::GetInstallReturnCode(install_status), 240 InstallUtil::GetInstallReturnCode(install_status),
241 install_static::GetAppGuid()); 241 install_static::GetAppGuid());
242 } 242 }
243 243
244 bool GoogleChromeDistribution::ShouldSetExperimentLabels() { 244 bool GoogleChromeDistribution::ShouldSetExperimentLabels() {
245 return true; 245 return true;
246 } 246 }
OLDNEW
« no previous file with comments | « chrome/common/trace_event_args_whitelist.cc ('k') | chrome/installer/util/user_experiment.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698