chrome/chrome_browser.gypi - Issue 7719029: Revert 97966 : Revert 97955 - First pass on intents options UI.

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/chrome_browser.gypi

Issue 7719029: Revert 97966 : Revert 97955 - First pass on intents options UI. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Merge head Created 9 years, 4 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/chrome_browser.gypi

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi

index f2403b21f8c6e8d133d2021938287b249bfd95c3..c935047700d96bad994e2c198ee527b831b67a8c 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -2942,6 +2942,8 @@

'browser/ui/input_window_dialog.h',

'browser/ui/input_window_dialog_gtk.cc',

'browser/ui/input_window_dialog_win.cc',

+ 'browser/ui/intents/intents_model.cc',

+ 'browser/ui/intents/intents_model.h',

'browser/ui/login/login_model.h',

'browser/ui/login/login_prompt.cc',

'browser/ui/login/login_prompt.h',

@@ -3615,6 +3617,8 @@

'browser/ui/webui/options/handler_options_handler.h',

'browser/ui/webui/options/import_data_handler.cc',

'browser/ui/webui/options/import_data_handler.h',

+ 'browser/ui/webui/options/intents_settings_handler.cc',

+ 'browser/ui/webui/options/intents_settings_handler.h',

'browser/ui/webui/options/language_options_handler.cc',

'browser/ui/webui/options/language_options_handler.h',

'browser/ui/webui/options/language_options_handler_common.cc',

« no previous file with comments | « chrome/browser/ui/webui/options/options_ui.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »