summaryrefslogtreecommitdiffstats
path: root/chrome/installer/launcher_support
diff options
context:
space:
mode:
authorcalamity@chromium.org <calamity@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-02 08:55:35 +0000
committercalamity@chromium.org <calamity@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-02 08:55:35 +0000
commit51b169898f83833de1a1b1d3d821a19660541603 (patch)
tree66b43d39203a8afc9080cc3bd4b5a688458071a9 /chrome/installer/launcher_support
parent120a0ddbcda18f148d47c85865bf7e2817ae4f06 (diff)
downloadchromium_src-51b169898f83833de1a1b1d3d821a19660541603.zip
chromium_src-51b169898f83833de1a1b1d3d821a19660541603.tar.gz
chromium_src-51b169898f83833de1a1b1d3d821a19660541603.tar.bz2
Remove GetDevelopmentExe from from chrome_launcher_support.
This was a convenience for app_host development to begin with but is no longer require as the app_host is going away. This is doing IO in an inconvenient place and may as well go away. BUG=265975 Review URL: https://chromiumcodereview.appspot.com/21274003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@215252 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/installer/launcher_support')
-rw-r--r--chrome/installer/launcher_support/chrome_launcher_support.cc20
-rw-r--r--chrome/installer/launcher_support/chrome_launcher_support.h4
2 files changed, 0 insertions, 24 deletions
diff --git a/chrome/installer/launcher_support/chrome_launcher_support.cc b/chrome/installer/launcher_support/chrome_launcher_support.cc
index 1d5c506..5705e24 100644
--- a/chrome/installer/launcher_support/chrome_launcher_support.cc
+++ b/chrome/installer/launcher_support/chrome_launcher_support.cc
@@ -45,18 +45,6 @@ const wchar_t kChromeExe[] = L"chrome.exe";
const wchar_t kUninstallArgumentsField[] = L"UninstallArguments";
const wchar_t kUninstallStringField[] = L"UninstallString";
-#ifndef OFFICIAL_BUILD
-base::FilePath GetDevelopmentExe(const wchar_t* exe_file) {
- base::FilePath current_directory;
- if (PathService::Get(base::DIR_EXE, &current_directory)) {
- base::FilePath chrome_exe_path(current_directory.Append(exe_file));
- if (base::PathExists(chrome_exe_path))
- return chrome_exe_path;
- }
- return base::FilePath();
-}
-#endif
-
// Reads a string value from the specified product's "ClientState" registry key.
// Returns true iff the value is present and successfully read.
bool GetClientStateValue(InstallationLevel level,
@@ -184,10 +172,6 @@ base::FilePath GetAppHostPathForInstallationLevel(InstallationLevel level) {
base::FilePath GetAnyChromePath() {
base::FilePath chrome_path;
-#ifndef OFFICIAL_BUILD
- // For development mode, chrome.exe should be in same dir as the stub.
- chrome_path = GetDevelopmentExe(kChromeExe);
-#endif
if (chrome_path.empty())
chrome_path = GetChromePathForInstallationLevel(SYSTEM_LEVEL_INSTALLATION);
if (chrome_path.empty())
@@ -197,10 +181,6 @@ base::FilePath GetAnyChromePath() {
base::FilePath GetAnyAppHostPath() {
base::FilePath app_host_path;
-#ifndef OFFICIAL_BUILD
- // For development mode, app_host.exe should be in same dir as chrome.exe.
- app_host_path = GetDevelopmentExe(kChromeAppHostExe);
-#endif
if (app_host_path.empty()) {
app_host_path = GetAppHostPathForInstallationLevel(
SYSTEM_LEVEL_INSTALLATION);
diff --git a/chrome/installer/launcher_support/chrome_launcher_support.h b/chrome/installer/launcher_support/chrome_launcher_support.h
index 5a948db..e9f6280 100644
--- a/chrome/installer/launcher_support/chrome_launcher_support.h
+++ b/chrome/installer/launcher_support/chrome_launcher_support.h
@@ -39,16 +39,12 @@ base::FilePath GetAppHostPathForInstallationLevel(InstallationLevel level);
// Returns the path to an installed chrome.exe, or an empty path. Prefers a
// system-level installation to a user-level installation. Uses Omaha client
// state to identify a Chrome installation location.
-// In non-official builds, to ease development, this will first look for a
-// chrome.exe in the same directory as the current executable.
// The file path returned (if any) is guaranteed to exist.
base::FilePath GetAnyChromePath();
// Returns the path to an installed app_host.exe, or an empty path. Prefers a
// system-level installation to a user-level installation. Uses Omaha client
// state to identify a App Host installation location.
-// In non-official builds, to ease development, this will first look for a
-// app_host.exe in the same directory as the current executable.
// The file path returned (if any) is guaranteed to exist.
base::FilePath GetAnyAppHostPath();