diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-27 16:44:31 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-27 16:44:31 +0000 |
| commit | 6a7748e79cb7118089d5857291cb76d57c5c8162 (patch) | |
| tree | bdfe13aba5f79d4c090bd27fdf75173ff751bb3c /chrome_frame/chrome_frame_launcher.gyp | |
| parent | 13ffa32ea65d5fda56bcb030643b989d5564c586 (diff) | |
| download | chromium_src-6a7748e79cb7118089d5857291cb76d57c5c8162.zip chromium_src-6a7748e79cb7118089d5857291cb76d57c5c8162.tar.gz chromium_src-6a7748e79cb7118089d5857291cb76d57c5c8162.tar.bz2 | |
Add a self-destruct mechanism to user-level Chrome Frame when it detects that system-level Chrome Frame is present. This is a first step to handling user-to-system-level handoff.
It will cause a user-level install to be correctly replaced with a system-level one once the user logs out and back in again. Additional changelists
will follow that:
1) Ensure full clean-up of the user-level installation.
2) Handle notifications such that logging out and in again isn't required.
BUG=82816
TEST=Install user-level Chrome Frame.
Review URL: http://codereview.chromium.org/7065024
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87033 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/chrome_frame_launcher.gyp')
| -rw-r--r-- | chrome_frame/chrome_frame_launcher.gyp | 36 |
1 files changed, 33 insertions, 3 deletions
diff --git a/chrome_frame/chrome_frame_launcher.gyp b/chrome_frame/chrome_frame_launcher.gyp index 01c9f2e..c03f2a4 100644 --- a/chrome_frame/chrome_frame_launcher.gyp +++ b/chrome_frame/chrome_frame_launcher.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2010 The Chromium Authors. All rights reserved. +# Copyright (c) 2011 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -102,6 +102,7 @@ '../chrome/chrome.gyp:chrome_version_header', 'chrome_frame.gyp:chrome_frame_utils', 'chrome_frame_helper_dll', + 'chrome_frame_helper_lib', ], 'resource_include_dirs': [ '<(INTERMEDIATE_DIR)', @@ -131,6 +132,7 @@ 'msvs_guid': '5E80032F-7033-4661-9016-D98268244783', 'dependencies': [ '../chrome/chrome.gyp:chrome_version_header', + 'chrome_frame_helper_lib', ], 'resource_include_dirs': [ '<(INTERMEDIATE_DIR)', @@ -146,8 +148,6 @@ 'bho_loader.h', 'chrome_frame_helper_dll.cc', 'chrome_frame_helper_dll.def', - 'chrome_frame_helper_util.cc', - 'chrome_frame_helper_util.h', 'chrome_frame_helper_version.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', 'chrome_tab.idl', @@ -161,6 +161,36 @@ 'ProgramDatabaseFile': '$(OutDir)\\chrome_frame_helper_dll.pdb', # Set /SUBSYSTEM:WINDOWS since this is not a command-line program. 'SubSystem': '2', + }, + }, + }, + { + 'target_name': 'chrome_frame_helper_lib', + 'type': 'static_library', + 'msvs_guid': '9984D820-1D28-48A7-957C-2AFA41B416C9', + 'dependencies': [ + '../chrome/chrome.gyp:chrome_version_header', + ], + 'resource_include_dirs': [ + '<(INTERMEDIATE_DIR)', + '<(SHARED_INTERMEDIATE_DIR)', + ], + 'include_dirs': [ + # To allow including "chrome_tab.h" + '<(INTERMEDIATE_DIR)', + '<(INTERMEDIATE_DIR)/../chrome_frame', + ], + 'sources': [ + 'chrome_frame_helper_util.cc', + 'chrome_frame_helper_util.h', + 'registry_watcher.cc', + 'registry_watcher.h', + '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h', + 'chrome_tab.idl', + 'iids.cc', + ], + 'msvs_settings': { + 'VCLinkerTool': { 'AdditionalDependencies': [ 'shlwapi.lib', ], |