diff options
| author | skuhne <skuhne@chromium.org> | 2014-10-06 19:59:08 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-10-07 02:59:22 +0000 |
| commit | ca1cfe21ad3313f22035412553a3c351eb675c36 (patch) | |
| tree | e0ec069543aac6ecd5fbec59503890964dbfd59b /athena/athena.gyp | |
| parent | 785ffa786a39e0b98ff3ebf1dfeec3c47340fd15 (diff) | |
| download | chromium_src-ca1cfe21ad3313f22035412553a3c351eb675c36.zip chromium_src-ca1cfe21ad3313f22035412553a3c351eb675c36.tar.gz chromium_src-ca1cfe21ad3313f22035412553a3c351eb675c36.tar.bz2 | |
Adding media detection for activities
BUG=403793
TEST=ResourceManagerTest.OnCriticalMediaHandling, and existing browser tests
TBR=perkj@chromium.org
Added perkj for the DEPS dependency for content/browser/media
Review URL: https://codereview.chromium.org/629803006
Cr-Commit-Position: refs/heads/master@{#298342}
Diffstat (limited to 'athena/athena.gyp')
| -rw-r--r-- | athena/athena.gyp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/athena/athena.gyp b/athena/athena.gyp index fc42ea3..8453bcb 100644 --- a/athena/athena.gyp +++ b/athena/athena.gyp @@ -154,6 +154,7 @@ 'content/content_activity_factory.h', 'content/content_proxy.cc', 'content/content_proxy.h', + 'content/media_utils.h', 'content/public/app_registry.h', 'content/public/content_activity_factory_creator.h', 'content/public/dialogs.h', @@ -189,6 +190,7 @@ ], 'sources': [ 'content/chrome/dialogs.cc', + 'content/chrome/media_utils.cc', 'content/chrome/scheme_classifier_factory.cc', 'content/chrome/web_activity_helpers.cc', 'extensions/chrome/athena_chrome_app_delegate.cc', @@ -209,6 +211,7 @@ ], 'sources': [ 'content/shell/dialogs.cc', + 'content/shell/media_utils.cc', 'content/shell/scheme_classifier_factory.cc', 'content/shell/web_activity_helpers.cc', 'extensions/shell/extensions_delegate_impl.cc', |