chrome/chrome_browser_ui.gypi - Issue 15969017: Warn by default when certain DLL conflicts exist on XP.

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 15969017: Warn by default when certain DLL conflicts exist on XP. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Freshly sync'ed Created 7 years, 6 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 e7beaf6ff21539d08371eba46bf50d26d256f46a..5a11e0d6a0932406c9dae58e5b23fbdf360e45d3 100644

--- a/chrome/chrome_browser_ui.gypi

+++ b/chrome/chrome_browser_ui.gypi

@@ -1580,6 +1580,8 @@

'browser/ui/views/color_chooser_win.cc',

'browser/ui/views/confirm_bubble_views.cc',

'browser/ui/views/confirm_bubble_views.h',

+ 'browser/ui/views/conflicting_module_view_win.cc',

+ 'browser/ui/views/conflicting_module_view_win.h',

'browser/ui/views/constrained_web_dialog_delegate_views.cc',

'browser/ui/views/constrained_window_views.cc',

'browser/ui/views/constrained_window_views.h',

« no previous file with comments | « chrome/browser/ui/views/toolbar_view.cc ('k') | chrome/common/pref_names.h » ('j') | no next file with comments »