diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-14 11:38:45 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-08-14 17:16:47 +0000 |
| commit | 3a97ca8dd9b96b599ae2d33e40df0dd2f7ea5859 (patch) | |
| tree | 43cc572ba067417c7341db81f71ae7cc6e0fcc3e /chromium/apps | |
| parent | f61ab1ac7f855cd281809255c0aedbb1895e1823 (diff) | |
| download | qtwebengine-chromium-3a97ca8dd9b96b599ae2d33e40df0dd2f7ea5859.tar.gz | |
BASELINE: Update chromium to 45.0.2454.40
Change-Id: Id2121d9f11a8fc633677236c65a3e41feef589e4
Reviewed-by: Andras Becsi <andras.becsi@theqtcompany.com>
Diffstat (limited to 'chromium/apps')
| -rw-r--r-- | chromium/apps/apps.gypi | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/chromium/apps/apps.gypi b/chromium/apps/apps.gypi index 7badfe3429e..130cb8cda20 100644 --- a/chromium/apps/apps.gypi +++ b/chromium/apps/apps.gypi @@ -75,7 +75,6 @@ ], ['toolkit_views==1', { 'dependencies': [ - '../extensions/extensions.gyp:extensions_browser', '../ui/strings/ui_strings.gyp:ui_strings', '../ui/views/views.gyp:views', ], @@ -84,6 +83,11 @@ ['exclude', 'ui/views/'], ], }], + ['toolkit_views==1 and enable_extensions==1', { + 'dependencies': [ + '../extensions/extensions.gyp:extensions_browser', + ], + }], ], # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. 'msvs_disabled_warnings': [ 4267, ], |