chrome/chrome_browser_ui.gypi - Issue 11307015: Upstream changes to chrome_browser.gypi.

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_ui.gypi

Issue 11307015: Upstream changes to chrome_browser.gypi. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: remove extraneous diff + move browser/ui deps Created 8 years, 2 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_ui.gypi

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

index ef666cfe111c0114cc73952c0eb890c055b30710..35ce4df4e64bf00fb50e44ab92a115aca7f6a2ac 100644

--- a/chrome/chrome_browser_ui.gypi

+++ b/chrome/chrome_browser_ui.gypi

@@ -2167,6 +2167,7 @@

}, { # safe_browsing==0

'dependencies!': [

+ 'safe_browsing_proto',

'safe_browsing_report_proto',

'../third_party/libusb/libusb.gyp:libusb',

@@ -2449,11 +2450,15 @@

'browser/ui/singleton_tabs.h',

'browser/ui/sync/browser_synced_window_delegate.cc',

'browser/ui/tab_contents/tab_contents_iterator.cc',

+ 'browser/ui/uma_browsing_activity_observer.cc',

+ 'browser/ui/uma_browsing_activity_observer.h',

+ 'browser/ui/webui/bookmarks_ui.cc',

+ 'browser/ui/webui/bookmarks_ui.h',

'browser/ui/webui/certificate_viewer_webui.cc',

'browser/ui/webui/extensions/command_handler.cc',

- 'browser/ui/webui/extensions/extensions_ui.cc',

'browser/ui/webui/extensions/extension_settings_handler.cc',

'browser/ui/webui/extensions/extension_settings_handler.h',

+ 'browser/ui/webui/extensions/extensions_ui.cc',

'browser/ui/webui/extensions/install_extension_handler.cc',

'browser/ui/webui/inspect_ui.cc',

'browser/ui/webui/inspect_ui.h',

@@ -2479,6 +2484,8 @@

'browser/ui/webui/suggestions_internals/suggestions_internals_ui.h',

'browser/ui/webui/suggestions_internals/suggestions_internals_ui_handler.cc',

'browser/ui/webui/suggestions_internals/suggestions_internals_ui_handler.h',

+ 'browser/ui/webui/tracing_ui.cc',

+ 'browser/ui/webui/tracing_ui.h',

'browser/ui/window_sizer/window_sizer.cc',

'browser/ui/window_sizer/window_sizer.h',

« no previous file with comments | « chrome/chrome_browser.gypi ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »