Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(21)

Side by Side Diff: extensions/shell/app_shell.gyp

Issue 418133002: Fix missing string resource for extensions_unittests on Chrome OS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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 | Annotate | Revision Log
« extensions/extensions.gyp ('K') | « extensions/extensions.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 28 matching lines...) Expand all
39 '<(DEPTH)/ui/strings/ui_strings.gyp:ui_strings', 39 '<(DEPTH)/ui/strings/ui_strings.gyp:ui_strings',
40 ], 40 ],
41 'actions': [ 41 'actions': [
42 { 42 {
43 'action_name': 'repack_app_shell_pack', 43 'action_name': 'repack_app_shell_pack',
44 'variables': { 44 'variables': {
45 'pak_inputs': [ 45 'pak_inputs': [
46 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.pak', 46 '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.pak',
47 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.pak', 47 '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.pak',
48 # TODO(jamescook): Extract the extension/app related resources 48 # TODO(jamescook): Extract the extension/app related resources
49 # from generated_resources_en-US.pak. 49 # from generated_resources_en-US.pak. http://crbug.com/397250
50 '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_en-US.pak', 50 '<(SHARED_INTERMEDIATE_DIR)/chrome/generated_resources_en-US.pak',
51 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources_100_percent. pak', 51 '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources_100_percent. pak',
52 '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak', 52 '<(SHARED_INTERMEDIATE_DIR)/content/shell_resources.pak',
53 '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_renderer_resourc es.pak', 53 '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_renderer_resourc es.pak',
54 '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_resources.pak', 54 '<(SHARED_INTERMEDIATE_DIR)/extensions/extensions_resources.pak',
55 '<(SHARED_INTERMEDIATE_DIR)/extensions/shell/app_shell_resources.p ak', 55 '<(SHARED_INTERMEDIATE_DIR)/extensions/shell/app_shell_resources.p ak',
56 '<(SHARED_INTERMEDIATE_DIR)/extensions/strings/extensions_strings_ en-US.pak', 56 '<(SHARED_INTERMEDIATE_DIR)/extensions/strings/extensions_strings_ en-US.pak',
57 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent. pak', 57 '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent. pak',
58 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.p ak', 58 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.p ak',
59 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak', 59 '<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 'browser/shell_browsertest.cc', 214 'browser/shell_browsertest.cc',
215 'test/shell_test.h', 215 'test/shell_test.h',
216 'test/shell_test.cc', 216 'test/shell_test.cc',
217 'test/shell_test_launcher_delegate.cc', 217 'test/shell_test_launcher_delegate.cc',
218 'test/shell_test_launcher_delegate.h', 218 'test/shell_test_launcher_delegate.h',
219 'test/shell_tests_main.cc', 219 'test/shell_tests_main.cc',
220 ], 220 ],
221 }, 221 },
222 ], # targets 222 ], # targets
223 } 223 }
OLDNEW
« extensions/extensions.gyp ('K') | « extensions/extensions.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698