| OLD | NEW |
| 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_frame_operations.h" | 5 #include "chrome/installer/util/chrome_frame_operations.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/file_path.h" | 8 #include "base/file_path.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "chrome/installer/util/browser_distribution.h" | 10 #include "chrome/installer/util/browser_distribution.h" |
| (...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 79 std::vector<FilePath>* key_files) const { | 79 std::vector<FilePath>* key_files) const { |
| 80 DCHECK(key_files); | 80 DCHECK(key_files); |
| 81 key_files->push_back(FilePath(installer::kChromeFrameDll)); | 81 key_files->push_back(FilePath(installer::kChromeFrameDll)); |
| 82 key_files->push_back(FilePath(installer::kChromeFrameHelperExe)); | 82 key_files->push_back(FilePath(installer::kChromeFrameHelperExe)); |
| 83 } | 83 } |
| 84 | 84 |
| 85 void ChromeFrameOperations::AddComDllList( | 85 void ChromeFrameOperations::AddComDllList( |
| 86 const std::set<std::wstring>& options, | 86 const std::set<std::wstring>& options, |
| 87 std::vector<FilePath>* com_dll_list) const { | 87 std::vector<FilePath>* com_dll_list) const { |
| 88 DCHECK(com_dll_list); | 88 DCHECK(com_dll_list); |
| 89 std::vector<FilePath> dll_list; | |
| 90 com_dll_list->push_back(FilePath(installer::kChromeFrameDll)); | 89 com_dll_list->push_back(FilePath(installer::kChromeFrameDll)); |
| 91 } | 90 } |
| 92 | 91 |
| 93 void ChromeFrameOperations::AppendProductFlags( | 92 void ChromeFrameOperations::AppendProductFlags( |
| 94 const std::set<std::wstring>& options, | 93 const std::set<std::wstring>& options, |
| 95 CommandLine* cmd_line) const { | 94 CommandLine* cmd_line) const { |
| 96 DCHECK(cmd_line); | 95 DCHECK(cmd_line); |
| 97 bool is_multi_install = options.find(kOptionMultiInstall) != options.end(); | 96 bool is_multi_install = options.find(kOptionMultiInstall) != options.end(); |
| 98 | 97 |
| 99 // Add --multi-install if it isn't already there. | 98 // Add --multi-install if it isn't already there. |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 141 return false; | 140 return false; |
| 142 #endif | 141 #endif |
| 143 } | 142 } |
| 144 | 143 |
| 145 bool ChromeFrameOperations::ShouldCreateUninstallEntry( | 144 bool ChromeFrameOperations::ShouldCreateUninstallEntry( |
| 146 const std::set<std::wstring>& options) const { | 145 const std::set<std::wstring>& options) const { |
| 147 return options.find(kOptionReadyMode) == options.end(); | 146 return options.find(kOptionReadyMode) == options.end(); |
| 148 } | 147 } |
| 149 | 148 |
| 150 } // namespace installer | 149 } // namespace installer |
| OLD | NEW |