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

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

Issue 367403002: Add missing Pass() calls for passing scoped_ptrs on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: :-( Created 6 years, 5 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
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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 base::string16 GetUninstallSurveyUrl() { 56 base::string16 GetUninstallSurveyUrl() {
57 const wchar_t kSurveyUrl[] = L"http://www.google.com/support/chrome/bin/" 57 const wchar_t kSurveyUrl[] = L"http://www.google.com/support/chrome/bin/"
58 L"request.py?hl=$1&contact_type=uninstall"; 58 L"request.py?hl=$1&contact_type=uninstall";
59 return LocalizeUrl(kSurveyUrl); 59 return LocalizeUrl(kSurveyUrl);
60 } 60 }
61 61
62 } // namespace 62 } // namespace
63 63
64 GoogleChromeDistribution::GoogleChromeDistribution() 64 GoogleChromeDistribution::GoogleChromeDistribution()
65 : BrowserDistribution(CHROME_BROWSER, 65 : BrowserDistribution(CHROME_BROWSER,
66 make_scoped_ptr( 66 scoped_ptr<AppRegistrationData>(
67 new UpdatingAppRegistrationData(kChromeGuid))) { 67 new UpdatingAppRegistrationData(kChromeGuid))) {
68 } 68 }
69 69
70 GoogleChromeDistribution::GoogleChromeDistribution( 70 GoogleChromeDistribution::GoogleChromeDistribution(
71 scoped_ptr<AppRegistrationData> app_reg_data) 71 scoped_ptr<AppRegistrationData> app_reg_data)
72 : BrowserDistribution(CHROME_BROWSER, app_reg_data.Pass()) { 72 : BrowserDistribution(CHROME_BROWSER, app_reg_data.Pass()) {
73 } 73 }
74 74
75 void GoogleChromeDistribution::DoPostUninstallOperations( 75 void GoogleChromeDistribution::DoPostUninstallOperations(
76 const Version& version, 76 const Version& version,
77 const base::FilePath& local_data_path, 77 const base::FilePath& local_data_path,
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
275 GetAppGuid()); 275 GetAppGuid());
276 } 276 }
277 277
278 bool GoogleChromeDistribution::ShouldSetExperimentLabels() { 278 bool GoogleChromeDistribution::ShouldSetExperimentLabels() {
279 return true; 279 return true;
280 } 280 }
281 281
282 bool GoogleChromeDistribution::HasUserExperiments() { 282 bool GoogleChromeDistribution::HasUserExperiments() {
283 return true; 283 return true;
284 } 284 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698