chrome/browser/resources/settings/basic_page/compiled_resources2.gyp - Issue 2518233004: MD Settings: Move settings-advanced-page into settings-basic-page

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/settings/basic_page/compiled_resources2.gyp

Issue 2518233004: MD Settings: Move settings-advanced-page into settings-basic-page (Closed)

Patch Set: rebase Created 4 years 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/resources/settings/basic_page/basic_page.js ('k') | chrome/browser/resources/settings/compiled_resources2.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/basic_page/compiled_resources2.gyp

diff --git a/chrome/browser/resources/settings/basic_page/compiled_resources2.gyp b/chrome/browser/resources/settings/basic_page/compiled_resources2.gyp

index c5fc14019f2b99633bd864fb2ae3a1fb41d04656..7a9b9ff051745b28c667dd68898e474ffc3f9c1a 100644

--- a/chrome/browser/resources/settings/basic_page/compiled_resources2.gyp

+++ b/chrome/browser/resources/settings/basic_page/compiled_resources2.gyp

@@ -8,8 +8,10 @@

'dependencies': [

'<(DEPTH)/ui/webui/resources/js/compiled_resources2.gyp:load_time_data',

'../compiled_resources2.gyp:route',

+ '../compiled_resources2.gyp:search_settings',

'../settings_page/compiled_resources2.gyp:main_page_behavior',

'../settings_page/compiled_resources2.gyp:settings_page_visibility',

+ '../settings_ui/compiled_resources2.gyp:settings_ui_types',

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