chrome/chrome_browser.gypi - Issue 2879002: Reapply r50859 with chromeos fixes.

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 2879002: Reapply r50859 with chromeos fixes. (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: add explicit menus:: to chromeos Created 10 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.gypi

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

index c32d6d180e691e0e08dd9ba324369568cf9a1495..da8f86b41613bd36c5f56e0f75b965ba51a9aa85 100644

--- a/chrome/chrome_browser.gypi

+++ b/chrome/chrome_browser.gypi

@@ -1395,6 +1395,10 @@

'browser/gtk/gtk_chrome_link_button.h',

'browser/gtk/gtk_chrome_shrinkable_hbox.cc',

'browser/gtk/gtk_chrome_shrinkable_hbox.h',

+ 'browser/gtk/gtk_custom_menu.cc',

+ 'browser/gtk/gtk_custom_menu.h',

+ 'browser/gtk/gtk_custom_menu_item.cc',

+ 'browser/gtk/gtk_custom_menu_item.h',

'browser/gtk/gtk_expanded_container.cc',

'browser/gtk/gtk_expanded_container.h',

'browser/gtk/gtk_floating_container.cc',

@@ -3279,6 +3283,10 @@

['include', '^browser/gtk/gtk_chrome_button.h'],

['include', '^browser/gtk/gtk_chrome_link_button.cc'],

['include', '^browser/gtk/gtk_chrome_link_button.h'],

+ ['include', '^browser/gtk/gtk_custom_menu.cc'],

+ ['include', '^browser/gtk/gtk_custom_menu.h'],

+ ['include', '^browser/gtk/gtk_custom_menu_item.cc'],

+ ['include', '^browser/gtk/gtk_custom_menu_item.h'],

['include', '^browser/gtk/gtk_theme_provider.cc'],

['include', '^browser/gtk/gtk_theme_provider.h'],

['include', '^browser/gtk/gtk_tree.cc'],

« no previous file with comments | « chrome/browser/wrench_menu_model.cc ('k') | no next file » | no next file with comments »