diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-18 00:57:49 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-03-18 00:57:49 +0000 |
| commit | 44b2c885548d647611d908309dfdf6306eac7ed8 (patch) | |
| tree | c46fd5199ac07df770ca9b01a0b73dc594b6d63d /chrome/chrome.gyp | |
| parent | 9eef357377e89bffd2d5ff9fad9de0c94d8cc934 (diff) | |
| download | chromium_src-44b2c885548d647611d908309dfdf6306eac7ed8.zip chromium_src-44b2c885548d647611d908309dfdf6306eac7ed8.tar.gz chromium_src-44b2c885548d647611d908309dfdf6306eac7ed8.tar.bz2 | |
Mac bookmark work.
- The bookmark menu is populated dynamically with bookmarks, including
subfolders --> submenus. E.g. star something --> shows up in menu.
Menu items are disabled but always present and current.
- Always Show Bookmarks" menu now live; reads from / writes to
preference, and shows correct "toggle state".
- Bookmark bar on each tab, present if requested. (Currently an empty box).
- Random stuff; e.g. bookmark prefs init moved to a x-plat location.
This CL does not contain Cole's views.
Bried english description of the nib file changes:
- add a new view for the bookmark bar in the tab; hook it up to the controller
- Many tag sets (e.g. View-->Always Show Bookmarks Bar now 40009)
- Remove dummy bookmark menu items
Review URL: http://codereview.chromium.org/46078
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11936 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome.gyp')
| -rw-r--r-- | chrome/chrome.gyp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp index 65c2f4a..f772692 100644 --- a/chrome/chrome.gyp +++ b/chrome/chrome.gyp @@ -484,6 +484,11 @@ 'browser/chrome_thread.h', 'browser/cocoa/base_view.h', 'browser/cocoa/base_view.mm', + 'browser/cocoa/bookmark_bar_state_controller.h', + 'browser/cocoa/bookmark_bar_state_controller.mm', + 'browser/cocoa/bookmark_menu_bridge.h', + 'browser/cocoa/bookmark_menu_bridge.mm', + 'browser/cocoa/browser_test_helper.h', 'browser/cocoa/browser_window_cocoa.h', 'browser/cocoa/browser_window_cocoa.mm', 'browser/cocoa/browser_window_controller.h', @@ -1956,6 +1961,11 @@ 'browser/debugger/devtools_manager_unittest.cc', 'browser/cache_manager_host_unittest.cc', 'browser/chrome_thread_unittest.cc', + # It is safe to list */cocoa/* files in the "common" file list + # without an explicit exclusion since gyp is smart enough to + # exclude them from non-Mac builds. + 'browser/cocoa/bookmark_bar_state_controller_unittest.mm', + 'browser/cocoa/bookmark_menu_bridge_unittest.mm', 'browser/command_updater_unittest.cc', 'browser/download/download_manager_unittest.cc', 'browser/download/download_request_manager_unittest.cc', @@ -2092,10 +2102,6 @@ 'views', ], },], - ['OS=="mac"', { - # mac tests load the resources from the built app beside the test - 'dependencies': ['app'], - }], ['OS!="win"', { 'sources!': [ 'browser/back_forward_menu_model_unittest.cc', |