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

Side by Side Diff: chrome/install_static/install_util.cc

Issue 2778223004: Move GetBaseAppName into install_static. (Closed)
Patch Set: sync to position 460686 Created 3 years, 8 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/install_static/install_util.h ('k') | chrome/installer/setup/uninstall.cc » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/install_static/install_util.h" 5 #include "chrome/install_static/install_util.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <assert.h> 8 #include <assert.h>
9 #include <stdlib.h> 9 #include <stdlib.h>
10 #include <string.h> 10 #include <string.h>
(...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 if (*kCompanyPathName) 322 if (*kCompanyPathName)
323 result.append(kCompanyPathName).append(1, L' '); 323 result.append(kCompanyPathName).append(1, L' ');
324 result.append(kProductPathName, kProductPathNameLength); 324 result.append(kProductPathName, kProductPathNameLength);
325 return result.append(InstallDetails::Get().mode().install_suffix); 325 return result.append(InstallDetails::Get().mode().install_suffix);
326 } 326 }
327 327
328 const wchar_t* GetAppGuid() { 328 const wchar_t* GetAppGuid() {
329 return InstallDetails::Get().app_guid(); 329 return InstallDetails::Get().app_guid();
330 } 330 }
331 331
332 std::wstring GetBaseAppName() {
333 return InstallDetails::Get().mode().base_app_name;
334 }
335
332 const wchar_t* GetBaseAppId() { 336 const wchar_t* GetBaseAppId() {
333 return InstallDetails::Get().base_app_id(); 337 return InstallDetails::Get().base_app_id();
334 } 338 }
335 339
336 const wchar_t* GetProgIdPrefix() { 340 const wchar_t* GetProgIdPrefix() {
337 return InstallDetails::Get().mode().prog_id_prefix; 341 return InstallDetails::Get().mode().prog_id_prefix;
338 } 342 }
339 343
340 const wchar_t* GetProgIdDescription() { 344 const wchar_t* GetProgIdDescription() {
341 return InstallDetails::Get().mode().prog_id_description; 345 return InstallDetails::Get().mode().prog_id_description;
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after
802 case ChannelStrategy::ADDITIONAL_PARAMETERS: 806 case ChannelStrategy::ADDITIONAL_PARAMETERS:
803 return ChannelFromAdditionalParameters(mode, system_level, from_binaries); 807 return ChannelFromAdditionalParameters(mode, system_level, from_binaries);
804 case ChannelStrategy::FIXED: 808 case ChannelStrategy::FIXED:
805 return mode.default_channel_name; 809 return mode.default_channel_name;
806 } 810 }
807 811
808 return std::wstring(); 812 return std::wstring();
809 } 813 }
810 814
811 } // namespace install_static 815 } // namespace install_static
OLDNEW
« no previous file with comments | « chrome/install_static/install_util.h ('k') | chrome/installer/setup/uninstall.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698