diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 02:18:23 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-22 02:18:23 +0000 |
| commit | 711f428ee4902672583deb28eb8002308e16c1d4 (patch) | |
| tree | fa2055aed0fa9dbfa24d3dbef22f9a7d096ae9ae /ash | |
| parent | 9613eacf26ab9f04831a88a8a90831020b548918 (diff) | |
| download | chromium_src-711f428ee4902672583deb28eb8002308e16c1d4.zip chromium_src-711f428ee4902672583deb28eb8002308e16c1d4.tar.gz chromium_src-711f428ee4902672583deb28eb8002308e16c1d4.tar.bz2 | |
Undo the startup_helper_win.h change in r143501 because that breaks the sandbox in component builds.
Review URL: https://chromiumcodereview.appspot.com/10638010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@143515 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/ash.gyp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/ash/ash.gyp b/ash/ash.gyp index 3c41a17..a9d2dd3 100644 --- a/ash/ash.gyp +++ b/ash/ash.gyp @@ -526,6 +526,7 @@ 'shell/window_watcher.h', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc', + '../content/app/startup_helper_win.cc', '../ui/views/test/test_views_delegate.cc', ], 'conditions': [ |