athena/resources/athena_resources.gyp - Issue 586853004: Remove AppDelegate::GetAppDefaultIcon

Side by Side Diff

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

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

Side by Side Diff: athena/resources/athena_resources.gyp

Issue 586853004: Remove AppDelegate::GetAppDefaultIcon (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@not-impl

Patch Set: (app-icon) rebase Created 6 years, 3 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:

View unified diff | Download patch

OLD	NEW
1 # Copyright 2014 The Chromium Authors. All rights reserved.	1 # Copyright 2014 The Chromium Authors. All rights reserved.

2 # Use of this source code is governed by a BSD-style license that can be	2 # Use of this source code is governed by a BSD-style license that can be

3 # found in the LICENSE file.	3 # found in the LICENSE file.

4	4

5 {	5 {

6 'variables': {	6 'variables': {

7 'chromium_code': 1,	7 'chromium_code': 1,

8 },	8 },

9 'targets': [	9 'targets': [

10 {	10 {

(...skipping 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
42 'action_name': 'repack_athena_pack',	42 'action_name': 'repack_athena_pack',

43 'variables': {	43 'variables': {

44 'pak_inputs': [	44 'pak_inputs': [

45 '<(PRODUCT_DIR)/extensions_shell_and_test.pak',	45 '<(PRODUCT_DIR)/extensions_shell_and_test.pak',

46 '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_100_percent. pak',	46 '<(SHARED_INTERMEDIATE_DIR)/ash/resources/ash_resources_100_percent. pak',

47 '<(SHARED_INTERMEDIATE_DIR)/athena/resources/athena_resources_100_pe rcent.pak',	47 '<(SHARED_INTERMEDIATE_DIR)/athena/resources/athena_resources_100_pe rcent.pak',

48 '<(SHARED_INTERMEDIATE_DIR)/components/component_resources_100_perce nt.pak',	48 '<(SHARED_INTERMEDIATE_DIR)/components/component_resources_100_perce nt.pak',

49 '<(SHARED_INTERMEDIATE_DIR)/components/component_resources.pak',	49 '<(SHARED_INTERMEDIATE_DIR)/components/component_resources.pak',

50 '<(SHARED_INTERMEDIATE_DIR)/components/strings/components_strings_en -US.pak',	50 '<(SHARED_INTERMEDIATE_DIR)/components/strings/components_strings_en -US.pak',

51 '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_ 100_percent.pak',	51 '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_ 100_percent.pak',

52 '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_browser_resources_ 100_percent.pak',

53 '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_resour ces_100_percent.pak',	52 '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/resources/ui_chromeos_resour ces_100_percent.pak',

54 '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/strings/ui_chromeos_strings_ en-US.pak',	53 '<(SHARED_INTERMEDIATE_DIR)/ui/chromeos/strings/ui_chromeos_strings_ en-US.pak',

55 ],	54 ],

56 'pak_output': '<(PRODUCT_DIR)/athena_resources.pak',	55 'pak_output': '<(PRODUCT_DIR)/athena_resources.pak',

57 },	56 },

58 'includes': [ '../../build/repack_action.gypi' ],	57 'includes': [ '../../build/repack_action.gypi' ],

59 }],	58 }],

60 },	59 },

61 ]	60 ]

62 }	61 }

OLD	NEW