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

Side by Side Diff: chrome/installer/util/google_chrome_sxs_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 implementation of GoogleChromeSxSDistribution. 5 // This file defines implementation of GoogleChromeSxSDistribution.
6 6
7 #include "chrome/installer/util/google_chrome_sxs_distribution.h" 7 #include "chrome/installer/util/google_chrome_sxs_distribution.h"
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "chrome/common/chrome_icon_resources_win.h" 11 #include "chrome/common/chrome_icon_resources_win.h"
12 #include "chrome/installer/util/updating_app_registration_data.h" 12 #include "chrome/installer/util/updating_app_registration_data.h"
13 13
14 #include "installer_util_strings.h" // NOLINT 14 #include "installer_util_strings.h" // NOLINT
15 15
16 namespace { 16 namespace {
17 17
18 const wchar_t kChromeSxSGuid[] = L"{4ea16ac7-fd5a-47c3-875b-dbf4a2008c20}"; 18 const wchar_t kChromeSxSGuid[] = L"{4ea16ac7-fd5a-47c3-875b-dbf4a2008c20}";
19 const wchar_t kChannelName[] = L"canary"; 19 const wchar_t kChannelName[] = L"canary";
20 const wchar_t kBrowserAppId[] = L"ChromeCanary"; 20 const wchar_t kBrowserAppId[] = L"ChromeCanary";
21 const wchar_t kBrowserProgIdPrefix[] = L"ChromeSSHTM"; 21 const wchar_t kBrowserProgIdPrefix[] = L"ChromeSSHTM";
22 const wchar_t kBrowserProgIdDesc[] = L"Chrome Canary HTML Document"; 22 const wchar_t kBrowserProgIdDesc[] = L"Chrome Canary HTML Document";
23 const wchar_t kCommandExecuteImplUuid[] = 23 const wchar_t kCommandExecuteImplUuid[] =
24 L"{1BEAC3E3-B852-44F4-B468-8906C062422E}"; 24 L"{1BEAC3E3-B852-44F4-B468-8906C062422E}";
25 25
26 } // namespace 26 } // namespace
27 27
28 GoogleChromeSxSDistribution::GoogleChromeSxSDistribution() 28 GoogleChromeSxSDistribution::GoogleChromeSxSDistribution()
29 : GoogleChromeDistribution( 29 : GoogleChromeDistribution(scoped_ptr<AppRegistrationData>(
30 make_scoped_ptr( 30 new UpdatingAppRegistrationData(kChromeSxSGuid))) {
31 new UpdatingAppRegistrationData(kChromeSxSGuid))) {
32 } 31 }
33 32
34 base::string16 GoogleChromeSxSDistribution::GetBaseAppName() { 33 base::string16 GoogleChromeSxSDistribution::GetBaseAppName() {
35 return L"Google Chrome Canary"; 34 return L"Google Chrome Canary";
36 } 35 }
37 36
38 base::string16 GoogleChromeSxSDistribution::GetShortcutName( 37 base::string16 GoogleChromeSxSDistribution::GetShortcutName(
39 ShortcutType shortcut_type) { 38 ShortcutType shortcut_type) {
40 switch (shortcut_type) { 39 switch (shortcut_type) {
41 case SHORTCUT_CHROME_ALTERNATE: 40 case SHORTCUT_CHROME_ALTERNATE:
(...skipping 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 return true; 118 return true;
120 } 119 }
121 120
122 bool GoogleChromeSxSDistribution::HasUserExperiments() { 121 bool GoogleChromeSxSDistribution::HasUserExperiments() {
123 return true; 122 return true;
124 } 123 }
125 124
126 base::string16 GoogleChromeSxSDistribution::ChannelName() { 125 base::string16 GoogleChromeSxSDistribution::ChannelName() {
127 return kChannelName; 126 return kChannelName;
128 } 127 }
OLDNEW
« no previous file with comments | « chrome/installer/util/google_chrome_distribution_dummy.cc ('k') | components/policy/core/common/registry_dict_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698