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

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

Issue 14031025: Implementing unified Chrome / App Launcher flow, and migrating old stand-alone App Launcher. (Closed) Base URL: http://chromium.googlesource.com/chromium/src.git@master
Patch Set: Feature-complete (except for unit tests for ShellUtil shortcut update code). Created 7 years, 7 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_app_host_operations.h" 5 #include "chrome/installer/util/chrome_app_host_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/common/chrome_switches.h" 10 #include "chrome/common/chrome_switches.h"
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 // Add --multi-install if it isn't already there. 76 // Add --multi-install if it isn't already there.
77 if (is_multi_install && !cmd_line->HasSwitch(switches::kMultiInstall)) 77 if (is_multi_install && !cmd_line->HasSwitch(switches::kMultiInstall))
78 cmd_line->AppendSwitch(switches::kMultiInstall); 78 cmd_line->AppendSwitch(switches::kMultiInstall);
79 } 79 }
80 80
81 bool ChromeAppHostOperations::SetChannelFlags(const std::set<string16>& options, 81 bool ChromeAppHostOperations::SetChannelFlags(const std::set<string16>& options,
82 bool set, 82 bool set,
83 ChannelInfo* channel_info) const { 83 ChannelInfo* channel_info) const {
84 #if defined(GOOGLE_CHROME_BUILD) 84 #if defined(GOOGLE_CHROME_BUILD)
85 DCHECK(channel_info); 85 DCHECK(channel_info);
86 return channel_info->SetAppLauncher(set); 86 // Force App Launcher to be absent from "ap" values.
87 return channel_info->SetAppLauncher(false);
87 #else 88 #else
88 return false; 89 return false;
89 #endif 90 #endif
90 } 91 }
91 92
92 bool ChromeAppHostOperations::ShouldCreateUninstallEntry( 93 bool ChromeAppHostOperations::ShouldCreateUninstallEntry(
93 const std::set<string16>& options) const { 94 const std::set<string16>& options) const {
94 return true; 95 return false;
95 } 96 }
96 97
97 void ChromeAppHostOperations::AddDefaultShortcutProperties( 98 void ChromeAppHostOperations::AddDefaultShortcutProperties(
98 BrowserDistribution* dist, 99 BrowserDistribution* dist,
99 const base::FilePath& target_exe, 100 const base::FilePath& target_exe,
100 ShellUtil::ShortcutProperties* properties) const { 101 ShellUtil::ShortcutProperties* properties) const {
101 if (!properties->has_target()) 102 if (!properties->has_target())
102 properties->set_target(target_exe); 103 properties->set_target(target_exe);
103 104
104 if (!properties->has_arguments()) { 105 if (!properties->has_arguments()) {
(...skipping 16 matching lines...) Expand all
121 const base::FilePath& setup_path, 122 const base::FilePath& setup_path,
122 const std::set<string16>& options, 123 const std::set<string16>& options,
123 InstallStatus status, 124 InstallStatus status,
124 bool system_level) const { 125 bool system_level) const {
125 // No experiments yet. If adding some in the future, need to have 126 // No experiments yet. If adding some in the future, need to have
126 // ChromeAppHostDistribution::HasUserExperiments() return true. 127 // ChromeAppHostDistribution::HasUserExperiments() return true.
127 NOTREACHED(); 128 NOTREACHED();
128 } 129 }
129 130
130 } // namespace installer 131 } // namespace installer
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698