chrome/browser/resources/options/compiled_resources.gyp - Issue 1155683008: Rename polymer and cr_elements v0_8 to v1_0

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/resources/options/compiled_resources.gyp

Issue 1155683008: Rename polymer and cr_elements v0_8 to v1_0 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@v1

Patch Set: fix a merge mistake Created 5 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/resources/options/compiled_resources.gyp

diff --git a/chrome/browser/resources/options/compiled_resources.gyp b/chrome/browser/resources/options/compiled_resources.gyp

index 720e750854527f1aac519222075d835df9c3b038..88bb559af985a53fc2c89fa7ac0c877139470384 100644

--- a/chrome/browser/resources/options/compiled_resources.gyp

+++ b/chrome/browser/resources/options/compiled_resources.gyp

@@ -8,7 +8,7 @@

'variables': {

'depends': [

'../../../../third_party/jstemplate/compiled_resources.gyp:jstemplate',

- '../../../../ui/webui/resources/cr_elements/v0_8/cr_onc/cr_onc_types.js',

+ '../../../../ui/webui/resources/cr_elements/v1_0/cr_onc/cr_onc_types.js',

'../../../../ui/webui/resources/css/tree.css.js',

'../../../../ui/webui/resources/js/action_link.js',

'../../../../ui/webui/resources/js/cr.js',

@@ -49,8 +49,8 @@

'externs': [

'../../../../third_party/closure_compiler/externs/chrome_extensions.js',

'../../../../third_party/closure_compiler/externs/chrome_send_externs.js',

- '../../../../ui/webui/resources/cr_elements/v0_8/cr_network_icon/cr_network_icon_externs.js',

- '../../../../ui/webui/resources/cr_elements/v0_8/cr_onc/cr_onc_data_externs.js',

+ '../../../../ui/webui/resources/cr_elements/v1_0/cr_network_icon/cr_network_icon_externs.js',

+ '../../../../ui/webui/resources/cr_elements/v1_0/cr_onc/cr_onc_data_externs.js',

'includes': ['../../../../third_party/closure_compiler/compile_js.gypi'],