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

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

Issue 811283002: [Installer] Cleaning up dead code for App Launcher / App Host installs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Comment fix. Created 5 years, 10 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
« no previous file with comments | « chrome/installer/util/chrome_app_host_operations.cc ('k') | chrome/installer/util/eula_util.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 cmd_line->AppendSwitch(switches::kMultiInstall); 81 cmd_line->AppendSwitch(switches::kMultiInstall);
82 } 82 }
83 } 83 }
84 84
85 bool ChromeBrowserOperations::SetChannelFlags( 85 bool ChromeBrowserOperations::SetChannelFlags(
86 const std::set<base::string16>& options, 86 const std::set<base::string16>& options,
87 bool set, 87 bool set,
88 ChannelInfo* channel_info) const { 88 ChannelInfo* channel_info) const {
89 #if defined(GOOGLE_CHROME_BUILD) 89 #if defined(GOOGLE_CHROME_BUILD)
90 DCHECK(channel_info); 90 DCHECK(channel_info);
91 return channel_info->SetChrome(set); 91 bool chrome_changed = channel_info->SetChrome(set);
92 // Remove App Launcher's channel flags, since App Launcher does not exist as
93 // an independent product, and is a part of Chrome.
94 bool app_launcher_changed = channel_info->SetAppLauncher(false);
95 return chrome_changed || app_launcher_changed;
92 #else 96 #else
93 return false; 97 return false;
94 #endif 98 #endif
95 } 99 }
96 100
97 bool ChromeBrowserOperations::ShouldCreateUninstallEntry( 101 bool ChromeBrowserOperations::ShouldCreateUninstallEntry(
98 const std::set<base::string16>& options) const { 102 const std::set<base::string16>& options) const {
99 return true; 103 return true;
100 } 104 }
101 105
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 const base::FilePath& setup_path, 145 const base::FilePath& setup_path,
142 const std::set<base::string16>& options, 146 const std::set<base::string16>& options,
143 InstallStatus status, 147 InstallStatus status,
144 bool system_level) const { 148 bool system_level) const {
145 base::CommandLine base_command(setup_path); 149 base::CommandLine base_command(setup_path);
146 AppendProductFlags(options, &base_command); 150 AppendProductFlags(options, &base_command);
147 installer::LaunchBrowserUserExperiment(base_command, status, system_level); 151 installer::LaunchBrowserUserExperiment(base_command, status, system_level);
148 } 152 }
149 153
150 } // namespace installer 154 } // namespace installer
OLDNEW
« no previous file with comments | « chrome/installer/util/chrome_app_host_operations.cc ('k') | chrome/installer/util/eula_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698