| 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_browser_operations.h" | 5 #include "chrome/installer/util/chrome_browser_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/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/logging.h" | 10 #include "base/logging.h" |
| (...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 86 bool chrome_changed = channel_info->SetChrome(set); | 86 bool chrome_changed = channel_info->SetChrome(set); |
| 87 // Remove App Launcher's channel flags, since App Launcher does not exist as | 87 // Remove App Launcher's channel flags, since App Launcher does not exist as |
| 88 // an independent product, and is a part of Chrome. | 88 // an independent product, and is a part of Chrome. |
| 89 bool app_launcher_changed = channel_info->SetAppLauncher(false); | 89 bool app_launcher_changed = channel_info->SetAppLauncher(false); |
| 90 return chrome_changed || app_launcher_changed; | 90 return chrome_changed || app_launcher_changed; |
| 91 #else | 91 #else |
| 92 return false; | 92 return false; |
| 93 #endif | 93 #endif |
| 94 } | 94 } |
| 95 | 95 |
| 96 bool ChromeBrowserOperations::ShouldCreateUninstallEntry( | |
| 97 const std::set<base::string16>& options) const { | |
| 98 return true; | |
| 99 } | |
| 100 | |
| 101 // Modifies a ShortcutProperties object by adding default values to | 96 // Modifies a ShortcutProperties object by adding default values to |
| 102 // uninitialized members. Tries to assign: | 97 // uninitialized members. Tries to assign: |
| 103 // - target: |chrome_exe|. | 98 // - target: |chrome_exe|. |
| 104 // - icon: from |chrome_exe|. | 99 // - icon: from |chrome_exe|. |
| 105 // - icon_index: |dist|'s icon index | 100 // - icon_index: |dist|'s icon index |
| 106 // - app_id: the browser model id for the current install. | 101 // - app_id: the browser model id for the current install. |
| 107 // - description: |dist|'s description. | 102 // - description: |dist|'s description. |
| 108 void ChromeBrowserOperations::AddDefaultShortcutProperties( | 103 void ChromeBrowserOperations::AddDefaultShortcutProperties( |
| 109 BrowserDistribution* dist, | 104 BrowserDistribution* dist, |
| 110 const base::FilePath& target_exe, | 105 const base::FilePath& target_exe, |
| (...skipping 17 matching lines...) Expand all Loading... |
| 128 const base::FilePath& setup_path, | 123 const base::FilePath& setup_path, |
| 129 const std::set<base::string16>& options, | 124 const std::set<base::string16>& options, |
| 130 InstallStatus status, | 125 InstallStatus status, |
| 131 bool system_level) const { | 126 bool system_level) const { |
| 132 base::CommandLine base_command(setup_path); | 127 base::CommandLine base_command(setup_path); |
| 133 AppendProductFlags(options, &base_command); | 128 AppendProductFlags(options, &base_command); |
| 134 installer::LaunchBrowserUserExperiment(base_command, status, system_level); | 129 installer::LaunchBrowserUserExperiment(base_command, status, system_level); |
| 135 } | 130 } |
| 136 | 131 |
| 137 } // namespace installer | 132 } // namespace installer |
| OLD | NEW |