summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--apps/app_host/DEPS3
-rw-r--r--apps/app_host/OWNERS (renamed from chrome/browser/extensions/app_host/OWNERS)0
-rw-r--r--apps/app_host/app_host.rc (renamed from chrome/browser/extensions/app_host/app_host.rc)2
-rw-r--r--apps/app_host/app_host_main.cc (renamed from chrome/browser/extensions/app_host/app_host_main.cc)4
-rw-r--r--apps/app_host/app_host_resource.h (renamed from chrome/browser/extensions/app_host/app_host_resource.h)0
-rw-r--r--apps/app_host/binaries_installer.cc (renamed from chrome/browser/extensions/app_host/binaries_installer.cc)2
-rw-r--r--apps/app_host/binaries_installer.h (renamed from chrome/browser/extensions/app_host/binaries_installer.h)6
-rw-r--r--apps/app_host/update.cc (renamed from chrome/browser/extensions/app_host/update.cc)2
-rw-r--r--apps/app_host/update.h (renamed from chrome/browser/extensions/app_host/update.h)6
-rw-r--r--apps/apps.gypi39
-rw-r--r--chrome/chrome_browser_extensions.gypi37
11 files changed, 53 insertions, 48 deletions
diff --git a/apps/app_host/DEPS b/apps/app_host/DEPS
new file mode 100644
index 0000000..7251c42
--- /dev/null
+++ b/apps/app_host/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+ "+google_update",
+]
diff --git a/chrome/browser/extensions/app_host/OWNERS b/apps/app_host/OWNERS
index 82e44d8..82e44d8 100644
--- a/chrome/browser/extensions/app_host/OWNERS
+++ b/apps/app_host/OWNERS
diff --git a/chrome/browser/extensions/app_host/app_host.rc b/apps/app_host/app_host.rc
index ef4d290..f4fedec 100644
--- a/chrome/browser/extensions/app_host/app_host.rc
+++ b/apps/app_host/app_host.rc
@@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_APP_HOST_MAIN ICON "..\\..\\..\\app\\theme\\app_list.ico"
+IDI_APP_HOST_MAIN ICON "..\\..\\chrome\\app\\theme\\app_list.ico"
/////////////////////////////////////////////////////////////////////////////
//
diff --git a/chrome/browser/extensions/app_host/app_host_main.cc b/apps/app_host/app_host_main.cc
index 578f18e..64de547 100644
--- a/chrome/browser/extensions/app_host/app_host_main.cc
+++ b/apps/app_host/app_host_main.cc
@@ -4,13 +4,13 @@
#include <windows.h>
+#include "apps/app_host/binaries_installer.h"
+#include "apps/app_host/update.h"
#include "base/at_exit.h"
#include "base/command_line.h"
#include "base/file_path.h"
#include "base/logging.h"
#include "base/process_util.h"
-#include "chrome/browser/extensions/app_host/binaries_installer.h"
-#include "chrome/browser/extensions/app_host/update.h"
#include "chrome/installer/launcher_support/chrome_launcher_support.h"
int APIENTRY wWinMain(HINSTANCE, HINSTANCE, wchar_t*, int) {
diff --git a/chrome/browser/extensions/app_host/app_host_resource.h b/apps/app_host/app_host_resource.h
index 29d289c..29d289c 100644
--- a/chrome/browser/extensions/app_host/app_host_resource.h
+++ b/apps/app_host/app_host_resource.h
diff --git a/chrome/browser/extensions/app_host/binaries_installer.cc b/apps/app_host/binaries_installer.cc
index 75fb8db..ce72888 100644
--- a/chrome/browser/extensions/app_host/binaries_installer.cc
+++ b/apps/app_host/binaries_installer.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/extensions/app_host/binaries_installer.h"
+#include "apps/app_host/binaries_installer.h"
#include "base/logging.h"
#include "base/threading/platform_thread.h"
diff --git a/chrome/browser/extensions/app_host/binaries_installer.h b/apps/app_host/binaries_installer.h
index 7d6ff19..8c70146 100644
--- a/chrome/browser/extensions/app_host/binaries_installer.h
+++ b/apps/app_host/binaries_installer.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_EXTENSIONS_APP_HOST_BINARIES_INSTALLER_H_
-#define CHROME_BROWSER_EXTENSIONS_APP_HOST_BINARIES_INSTALLER_H_
+#ifndef APPS_APP_HOST_BINARIES_INSTALLER_H_
+#define APPS_APP_HOST_BINARIES_INSTALLER_H_
#include <windows.h>
@@ -16,4 +16,4 @@ HRESULT InstallBinaries();
} // namespace app_host
-#endif // CHROME_BROWSER_EXTENSIONS_APP_HOST_BINARIES_INSTALLER_H_
+#endif // APPS_APP_HOST_BINARIES_INSTALLER_H_
diff --git a/chrome/browser/extensions/app_host/update.cc b/apps/app_host/update.cc
index 4d466f7..e8b14be8 100644
--- a/chrome/browser/extensions/app_host/update.cc
+++ b/apps/app_host/update.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "chrome/browser/extensions/app_host/update.h"
+#include "apps/app_host/update.h"
#include <windows.h>
#include "base/command_line.h"
diff --git a/chrome/browser/extensions/app_host/update.h b/apps/app_host/update.h
index af14da27..b72c985 100644
--- a/chrome/browser/extensions/app_host/update.h
+++ b/apps/app_host/update.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CHROME_BROWSER_EXTENSIONS_APP_HOST_UPDATE_H_
-#define CHROME_BROWSER_EXTENSIONS_APP_HOST_UPDATE_H_
+#ifndef APPS_APP_HOST_UPDATE_H_
+#define APPS_APP_HOST_UPDATE_H_
namespace app_host {
@@ -13,4 +13,4 @@ void EnsureAppHostUpToDate();
} // namespace app_host
-#endif // CHROME_BROWSER_EXTENSIONS_APP_HOST_UPDATE_H_
+#endif // APPS_APP_HOST_UPDATE_H_
diff --git a/apps/apps.gypi b/apps/apps.gypi
index 257195d..76bca7e 100644
--- a/apps/apps.gypi
+++ b/apps/apps.gypi
@@ -44,4 +44,43 @@
'msvs_disabled_warnings': [ 4267, ],
},
],
+ 'conditions': [
+ ['OS=="win"', {
+ 'targets': [
+ {
+ 'target_name': 'app_host',
+ 'type': 'executable',
+ 'include_dirs': [
+ '..',
+ ],
+ 'direct_dependent_settings': {
+ 'include_dirs': [
+ '..',
+ ],
+ },
+ 'dependencies': [
+ '<(DEPTH)/base/base.gyp:base',
+ '<(DEPTH)/chrome/chrome.gyp:chrome_version_resources',
+ '<(DEPTH)/chrome/chrome.gyp:launcher_support',
+ '<(DEPTH)/google_update/google_update.gyp:google_update',
+ ],
+ 'sources': [
+ 'app_host/app_host.rc',
+ 'app_host/app_host_main.cc',
+ 'app_host/app_host_resource.h',
+ 'app_host/binaries_installer.cc',
+ 'app_host/binaries_installer.h',
+ 'app_host/update.cc',
+ 'app_host/update.h',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome_version/app_host_exe_version.rc',
+ ],
+ 'msvs_settings': {
+ 'VCLinkerTool': {
+ 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
+ },
+ },
+ },
+ ],
+ },], # 'OS=="win"'
+ ], # 'conditions'
}
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index 8cd53f9..ec47a22 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -932,43 +932,6 @@
},
],
'conditions': [
- ['OS=="win"', {
- 'targets': [
- {
- 'target_name': 'app_host',
- 'type': 'executable',
- 'include_dirs': [
- '..',
- ],
- 'direct_dependent_settings': {
- 'include_dirs': [
- '..',
- ],
- },
- 'dependencies': [
- '<(DEPTH)/base/base.gyp:base',
- '<(DEPTH)/chrome/chrome.gyp:chrome_version_resources',
- '<(DEPTH)/chrome/chrome.gyp:launcher_support',
- '<(DEPTH)/google_update/google_update.gyp:google_update',
- ],
- 'sources': [
- 'browser/extensions/app_host/app_host.rc',
- 'browser/extensions/app_host/app_host_main.cc',
- 'browser/extensions/app_host/app_host_resource.h',
- 'browser/extensions/app_host/binaries_installer.cc',
- 'browser/extensions/app_host/binaries_installer.h',
- 'browser/extensions/app_host/update.cc',
- 'browser/extensions/app_host/update.h',
- '<(SHARED_INTERMEDIATE_DIR)/chrome_version/app_host_exe_version.rc',
- ],
- 'msvs_settings': {
- 'VCLinkerTool': {
- 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
- },
- },
- },
- ],
- },], # 'OS=="win"'
['chromeos==1', {
'targets': [
{
generated by cgit v1.1 at 2025-02-19 05:54:03 +0000