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

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

Issue 12321061: Pulling user experiment code from BrowserDistribution to a new class. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: *Only* making ProductOperation to use string16 instead of std::wstring; wrapping changes. Created 7 years, 9 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 #include "chrome/installer/util/chrome_binaries_operations.h" 5 #include "chrome/installer/util/chrome_binaries_operations.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "chrome/installer/util/channel_info.h" 10 #include "chrome/installer/util/channel_info.h"
11 #include "chrome/installer/util/helper.h" 11 #include "chrome/installer/util/helper.h"
12 #include "chrome/installer/util/master_preferences.h" 12 #include "chrome/installer/util/master_preferences.h"
13 #include "chrome/installer/util/master_preferences_constants.h" 13 #include "chrome/installer/util/master_preferences_constants.h"
14 #include "chrome/installer/util/util_constants.h" 14 #include "chrome/installer/util/util_constants.h"
15 15
16 namespace installer { 16 namespace installer {
17 17
18 void ChromeBinariesOperations::ReadOptions( 18 void ChromeBinariesOperations::ReadOptions(const MasterPreferences& prefs,
19 const MasterPreferences& prefs, 19 std::set<string16>* options) const {
20 std::set<std::wstring>* options) const {
21 DCHECK(options); 20 DCHECK(options);
22 options->insert(kOptionMultiInstall); 21 options->insert(kOptionMultiInstall);
23 } 22 }
24 23
25 void ChromeBinariesOperations::ReadOptions( 24 void ChromeBinariesOperations::ReadOptions(const CommandLine& uninstall_command,
26 const CommandLine& uninstall_command, 25 std::set<string16>* options) const {
27 std::set<std::wstring>* options) const {
28 DCHECK(options); 26 DCHECK(options);
29 options->insert(kOptionMultiInstall); 27 options->insert(kOptionMultiInstall);
30 } 28 }
31 29
32 void ChromeBinariesOperations::AddKeyFiles( 30 void ChromeBinariesOperations::AddKeyFiles(
33 const std::set<std::wstring>& options, 31 const std::set<string16>& options,
34 std::vector<base::FilePath>* key_files) const { 32 std::vector<base::FilePath>* key_files) const {
35 DCHECK(key_files); 33 DCHECK(key_files);
36 key_files->push_back(base::FilePath(installer::kChromeDll)); 34 key_files->push_back(base::FilePath(installer::kChromeDll));
37 } 35 }
38 36
39 void ChromeBinariesOperations::AddComDllList( 37 void ChromeBinariesOperations::AddComDllList(
40 const std::set<std::wstring>& options, 38 const std::set<string16>& options,
41 std::vector<base::FilePath>* com_dll_list) const { 39 std::vector<base::FilePath>* com_dll_list) const {
42 } 40 }
43 41
44 void ChromeBinariesOperations::AppendProductFlags( 42 void ChromeBinariesOperations::AppendProductFlags(
45 const std::set<std::wstring>& options, 43 const std::set<string16>& options,
46 CommandLine* cmd_line) const { 44 CommandLine* cmd_line) const {
47 DCHECK(cmd_line); 45 DCHECK(cmd_line);
48 46
49 DCHECK(options.find(kOptionMultiInstall) != options.end()); 47 DCHECK(options.find(kOptionMultiInstall) != options.end());
50 48
51 // Add --multi-install if it isn't already there. 49 // Add --multi-install if it isn't already there.
52 if (!cmd_line->HasSwitch(switches::kMultiInstall)) 50 if (!cmd_line->HasSwitch(switches::kMultiInstall))
53 cmd_line->AppendSwitch(switches::kMultiInstall); 51 cmd_line->AppendSwitch(switches::kMultiInstall);
54 } 52 }
55 53
56 void ChromeBinariesOperations::AppendRenameFlags( 54 void ChromeBinariesOperations::AppendRenameFlags(
57 const std::set<std::wstring>& options, 55 const std::set<string16>& options,
58 CommandLine* cmd_line) const { 56 CommandLine* cmd_line) const {
59 DCHECK(cmd_line); 57 DCHECK(cmd_line);
60 58
61 DCHECK(options.find(kOptionMultiInstall) != options.end()); 59 DCHECK(options.find(kOptionMultiInstall) != options.end());
62 60
63 // Add --multi-install if it isn't already there. 61 // Add --multi-install if it isn't already there.
64 if (!cmd_line->HasSwitch(switches::kMultiInstall)) 62 if (!cmd_line->HasSwitch(switches::kMultiInstall))
65 cmd_line->AppendSwitch(switches::kMultiInstall); 63 cmd_line->AppendSwitch(switches::kMultiInstall);
66 } 64 }
67 65
68 bool ChromeBinariesOperations::SetChannelFlags( 66 bool ChromeBinariesOperations::SetChannelFlags(
69 const std::set<std::wstring>& options, 67 const std::set<string16>& options,
70 bool set, 68 bool set,
71 ChannelInfo* channel_info) const { 69 ChannelInfo* channel_info) const {
72 return false; 70 return false;
73 } 71 }
74 72
75 bool ChromeBinariesOperations::ShouldCreateUninstallEntry( 73 bool ChromeBinariesOperations::ShouldCreateUninstallEntry(
76 const std::set<std::wstring>& options) const { 74 const std::set<string16>& options) const {
77 return false; 75 return false;
78 } 76 }
79 77
80 void ChromeBinariesOperations::AddDefaultShortcutProperties( 78 void ChromeBinariesOperations::AddDefaultShortcutProperties(
81 BrowserDistribution* dist, 79 BrowserDistribution* dist,
82 const base::FilePath& target_exe, 80 const base::FilePath& target_exe,
83 ShellUtil::ShortcutProperties* properties) const { 81 ShellUtil::ShortcutProperties* properties) const {
84 NOTREACHED() << "Chrome Binaries do not create shortcuts."; 82 NOTREACHED() << "Chrome Binaries do not create shortcuts.";
85 } 83 }
86 84
85 void ChromeBinariesOperations::LaunchUserExperiment(
86 const base::FilePath& setup_path,
87 const std::set<string16>& options,
88 InstallStatus status,
89 bool system_level) const {
90 // Not meaningful to have binaries run experiments.
91 NOTREACHED();
92 }
93
87 } // namespace installer 94 } // namespace installer
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698