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

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

Issue 360059: Remove build time differences between Chrome Frame and Google Chrome in the... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 11 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 | Annotate | Revision Log
« no previous file with comments | « chrome/installer/util/google_chrome_distribution.h ('k') | no next file » | 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) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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 <atlbase.h> 10 #include <atlbase.h>
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 case installer_util::FIRST_INSTALL_SUCCESS: 295 case installer_util::FIRST_INSTALL_SUCCESS:
296 case installer_util::INSTALL_REPAIRED: 296 case installer_util::INSTALL_REPAIRED:
297 case installer_util::NEW_VERSION_UPDATED: 297 case installer_util::NEW_VERSION_UPDATED:
298 case installer_util::HIGHER_VERSION_EXISTS: 298 case installer_util::HIGHER_VERSION_EXISTS:
299 return 0; // For Google Update's benefit we need to return 0 for success 299 return 0; // For Google Update's benefit we need to return 0 for success
300 default: 300 default:
301 return status; 301 return status;
302 } 302 }
303 } 303 }
304 304
305 std::string GoogleChromeDistribution::GetSafeBrowsingName() {
306 return "googlechrome";
307 }
308
305 std::wstring GoogleChromeDistribution::GetStateKey() { 309 std::wstring GoogleChromeDistribution::GetStateKey() {
306 std::wstring key(google_update::kRegPathClientState); 310 std::wstring key(google_update::kRegPathClientState);
307 key.append(L"\\"); 311 key.append(L"\\");
308 key.append(kChromeGuid); 312 key.append(kChromeGuid);
309 return key; 313 return key;
310 } 314 }
311 315
312 std::wstring GoogleChromeDistribution::GetStateMediumKey() { 316 std::wstring GoogleChromeDistribution::GetStateMediumKey() {
313 std::wstring key(google_update::kRegPathClientStateMedium); 317 std::wstring key(google_update::kRegPathClientStateMedium);
314 key.append(L"\\"); 318 key.append(L"\\");
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
502 }; 506 };
503 GoogleUpdateSettings::SetClient(GetExperimentGroup(outcome, flavor)); 507 GoogleUpdateSettings::SetClient(GetExperimentGroup(outcome, flavor));
504 if (outcome != kToastExpUninstallGroup) 508 if (outcome != kToastExpUninstallGroup)
505 return; 509 return;
506 // The user wants to uninstall. This is a best effort operation. Note that 510 // The user wants to uninstall. This is a best effort operation. Note that
507 // we waited for chrome to exit so the uninstall would not detect chrome 511 // we waited for chrome to exit so the uninstall would not detect chrome
508 // running. 512 // running.
509 base::LaunchApp(InstallUtil::GetChromeUninstallCmd(false), 513 base::LaunchApp(InstallUtil::GetChromeUninstallCmd(false),
510 false, false, NULL); 514 false, false, NULL);
511 } 515 }
OLDNEW
« no previous file with comments | « chrome/installer/util/google_chrome_distribution.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698