diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-01-25 11:39:07 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-01-25 15:20:42 +0000 |
| commit | 6c91641271e536ffaa88a1dff5127e42ee99a91e (patch) | |
| tree | 703d9dd49602377ddc90cbf886aad37913f2496b /chromium/chrome/browser/devtools | |
| parent | b145b7fafd36f0c260d6a768c81fc14e32578099 (diff) | |
| download | qtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz | |
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources.
Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/chrome/browser/devtools')
| -rw-r--r-- | chromium/chrome/browser/devtools/device/webrtc/resources.grd | 17 | ||||
| -rw-r--r-- | chromium/chrome/browser/devtools/webrtc_device_provider_resources.gyp | 26 |
2 files changed, 0 insertions, 43 deletions
diff --git a/chromium/chrome/browser/devtools/device/webrtc/resources.grd b/chromium/chrome/browser/devtools/device/webrtc/resources.grd deleted file mode 100644 index 01524333346..00000000000 --- a/chromium/chrome/browser/devtools/device/webrtc/resources.grd +++ /dev/null @@ -1,17 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<grit latest_public_release="0" current_release="1"> - <outputs> - <output filename="grit/webrtc_device_provider_resources.h" type="rc_header"> - <emit emit_type='prepend'></emit> - </output> - <output filename="grit/webrtc_device_provider_resources_map.cc" type="resource_file_map_source" /> - <output filename="grit/webrtc_device_provider_resources_map.h" type="resource_map_header" /> - <output filename="webrtc_device_provider_resources.pak" type="data_package" /> - </outputs> - <release seq="1"> - <includes> - <include name="IDR_BACKGROUND_WORKER_HTML" file="background_worker.html" flattenhtml="false" allowexternalscript="true" type="BINDATA" /> - <include name="IDR_WEBRTC_DEVICE_PROVIDER_JS" file="js/webrtc_device_provider.js" type="BINDATA" /> - </includes> - </release> -</grit> diff --git a/chromium/chrome/browser/devtools/webrtc_device_provider_resources.gyp b/chromium/chrome/browser/devtools/webrtc_device_provider_resources.gyp deleted file mode 100644 index 35d645f3f7c..00000000000 --- a/chromium/chrome/browser/devtools/webrtc_device_provider_resources.gyp +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright 2014 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. - -{ - 'targets': [ - { - # GN version: //chrome/browser/devtools:webrtc_device_provider_resources - 'target_name': 'webrtc_device_provider_resources', - 'type': 'none', - 'variables': { - 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', - }, - 'actions': [ - { - 'action_name': 'generate_webrtc_device_provider_resources', - 'variables': { - 'grit_grd_file': 'device/webrtc/resources.grd', - }, - 'includes': [ '../../../build/grit_action.gypi' ], - }, - ], - 'includes': [ '../../../build/grit_target.gypi' ], - }, - ] -} |