diff options
| author | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-04 01:44:30 +0000 |
|---|---|---|
| committer | chase@chromium.org <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-02-04 01:44:30 +0000 |
| commit | f9e8dbbf401d1ceada479461f6e9fb395eab6990 (patch) | |
| tree | aba0cbc73c91c92cc017ec71483d588759f92d89 /chrome/chrome_browser.gypi | |
| parent | 506f16d32a23d660e473f052564688f05eabfb67 (diff) | |
| download | chromium_src-f9e8dbbf401d1ceada479461f6e9fb395eab6990.zip chromium_src-f9e8dbbf401d1ceada479461f6e9fb395eab6990.tar.gz chromium_src-f9e8dbbf401d1ceada479461f6e9fb395eab6990.tar.bz2 | |
Revert 38056 - Unfork BookmarkMenuGtk and BookmarkMenuController.
This is step 2 of 3. bookmark_context_menu_controller_gtk will eventually replace bookmark_context_menu_controller; for now it is separate because getting Windows to use it is another huge hassle.
BUG=32830
TEST=manual + trybots
Review URL: http://codereview.chromium.org/563017
TBR=estade@chromium.org
Review URL: http://codereview.chromium.org/567041
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38065 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
| -rwxr-xr-x | chrome/chrome_browser.gypi | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 748874d..8ced6dc 100755 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -167,8 +167,6 @@ 'browser/bookmarks/bookmark_codec.h', 'browser/bookmarks/bookmark_context_menu_controller.cc', 'browser/bookmarks/bookmark_context_menu_controller.h', - 'browser/bookmarks/bookmark_context_menu_controller_gtk.cc', - 'browser/bookmarks/bookmark_context_menu_controller_gtk.h', 'browser/bookmarks/bookmark_drag_data.cc', 'browser/bookmarks/bookmark_drag_data.h', 'browser/bookmarks/bookmark_drop_info.cc', @@ -910,6 +908,8 @@ 'browser/gtk/bookmark_bar_instructions_gtk.h', 'browser/gtk/bookmark_bubble_gtk.cc', 'browser/gtk/bookmark_bubble_gtk.h', + 'browser/gtk/bookmark_context_menu_gtk.cc', + 'browser/gtk/bookmark_context_menu_gtk.h', 'browser/gtk/bookmark_editor_gtk.cc', 'browser/gtk/bookmark_editor_gtk.h', 'browser/gtk/bookmark_manager_gtk.cc', @@ -2072,9 +2072,6 @@ # Windows-specific files. 'browser/password_manager/password_store_win.cc', 'browser/password_manager/password_store_win.h', - # Disabled while bookmark context menus are unforked. - 'browser/bookmarks/bookmark_context_menu_controller.cc', - 'browser/bookmarks/bookmark_context_menu_controller.h', ], 'sources': [ 'browser/crash_handler_host_linux.h', |