summaryrefslogtreecommitdiffstats
path: root/chrome/browser/cocoa/bookmark_bar_view.mm
Commit message (Collapse)AuthorAgeFilesLines
* [Mac]Implement ViewID support. (third approach)suzhe@chromium.org2010-07-201-1/+6
| | | | | | | | | | | | | | | | This CL adds several extension methods to NSView class for ViewID support, and uses a map to store ViewIDs of views. Each view requiring ViewID support can set its ViewID upon initialization and unset it before destruction. When looking up a view with a specific ViewID, just search all sub views recursively from the root view of a window. BUG=44692 need ViewIds on mac TEST=none Review URL: http://codereview.chromium.org/2878037 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53067 0039d316-1c4b-4281-b951-d872f2087c98
* Resize the "For quick access..." and "Import bookmarks now..." components ↵mrossetti@chromium.org2010-05-261-0/+4
| | | | | | | | | | | | | | | | | | shown in the bookmark bar when there are no bookmarks in the bar, when the window resizes. Show ellipses when each gets trimmed and hide them when they get too small. BookmarkBar.xib changes: Connect the "Import bookmarks now..." button up to the importBookmarksButton_ outlet in the BookmarkBarView. BUG=32557 TEST=1) Start up a browser with no bookmarks on the bookmarks bar. 2) Verify that the "For quick access..." and "Import bookmarks now..." test fully shows. 3) Start shrinking the width of the browser window. 4) Verify that the "Import bookmarks now..." text is shrunk/clipped and finally disappears as the window gets narrower. 5) Continue shrinking the width and verify that the "For quick access..." text is shrunk/clipped with ellipses as the window gets narrower. 6) Grow the window and verify that the "For quick access..." reappears and then the "Import book now..." does. Review URL: http://codereview.chromium.org/2243002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48316 0039d316-1c4b-4281-b951-d872f2087c98
* Don't populate WebDropData with file URLs when dragging files.dcheng@chromium.org2010-05-241-2/+2
| | | | | | | | | | | This is the OS X patch. There will be separate patches for Windows and Linux. BUG=42685 TEST=unit_tests --gtest_filter=WebDropTargetTest.* Review URL: http://codereview.chromium.org/2095011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@48016 0039d316-1c4b-4281-b951-d872f2087c98
* Implement drag from bookmark manager to bookmark bar or a folder thereof. ↵mrossetti@chromium.org2010-05-181-45/+43
| | | | | | | | | | | | | | | | | | | Implement drag of other bookmark and URL sources such as from the Desktop or a text selection. BUG=39884,44228 TEST=Note: For all drag operations verify that the appropriate drop indicator is presented while dragging. When dragging onto a bookmark bar folder the folder button should be highlighted and, after a short delay, open into a menu. When dragging between folders or on top of a non-folder bookmark an insertion bar (vertical when in the bookmark bar, horizontal when in a folder menu) should be presented. For 'copy' moves the drag image should be adorned with a plus sign in a green circle. A non-copy move should show no such tag. 1) Drag a non-folder bookmark from the bookmark manager to the bookmark bar such that it falls on a non-folder bookmark. Verify that the bookmark is moved to be on the bar just before the bookmark upon which is was dropped. 2) Drag a folder bookmark from the manager to the bookmark bar such that it falls on a non-folder bookmark. Verify that the folder (as a folder) is moved to be on the bar just before the bookmark upon which is was dropped. 3) Drag a bookmark from the manager to a folder on the bookmark bar. Verify that the bookmark is added to the folder at the end and removed from the old location in the manager. 4) Drag a bookmark from the manager to a folder on the bookmark bar and wait for the folder to open and then drag to within the folder. Verify that dropping places the bookmark and removes it from the old location in the manager. 5) Drag a bookmark from the bar to the manager and verify that the manager now shows the dragged bookmark. (Note that this should be a 'move' but is currently a 'copy'. See http://crbug.com/44039.) 6) Drag a bookmark clipping from the Finder Desktop to the bookmark bar. Verify that it is added to the bar as a new bookmark. 7) Drag a bookmark clipping from the Finder Desktop to a folder on the bookmark bar and drop it within the folder menu. Verify that it is added to the folder as a new bookmark. 8) Create a URL in TextEdit or Stickies, select it and drag to the bookmark bar. Verify that it is added to the bar. 9) Create a URL in TextEdit or Stickies, select it and drag to a folder on the bookmark bar and drop it within the folder menu. Verify that it is added to the folder. Review URL: http://codereview.chromium.org/2066001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47523 0039d316-1c4b-4281-b951-d872f2087c98
* Move third_pary/mozilla/include up one directory.evan@chromium.org2010-04-151-1/+1
| | | | | | | | | | This allows the license checker to find the README. BUG=39240 Review URL: http://codereview.chromium.org/1596025 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44655 0039d316-1c4b-4281-b951-d872f2087c98
* Add "import bookmarks" link to bookmark bar when it is devoid of folders or ↵mirandac@chromium.org2010-03-241-0/+1
| | | | | | | | | | | | links. The link itself was added to the nib as an NSButton; the link and "no bookmarks" text were both embedded in a GTMWidthTweaker to keep them nicely positioned when localized. BUG= 28753 TEST= create browser with empty profile or remove all bookmarks. Link should appear that creates a dialog box which allows you to import data from other browsers, as in Windows version. Review URL: http://codereview.chromium.org/1246001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42530 0039d316-1c4b-4281-b951-d872f2087c98
* Cleanup.mrossetti@chromium.org2010-03-121-2/+1
| | | | | | | | | BUG=None TEST=None Review URL: http://codereview.chromium.org/905001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41384 0039d316-1c4b-4281-b951-d872f2087c98
* Add bookmark copying while dragging by holding down the <option> key.mrossetti@chromium.org2010-03-111-1/+5
| | | | | | | | | BUG=35969 TEST=Hold down the <option> key while dragging a bookmark to a new location. Repeat with the following: 1) From bookmark bar to bookmark bar, 2) from bookmark bar into a folder, 3) from within a folder to a different place within the same folder, 4) from within a folder to the bookmark bar, 5) from within a folder to a different folder. Check to insure that the original bookmark (and its contents if it was a folder) are in both the original location and the new location. Review URL: http://codereview.chromium.org/790001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41252 0039d316-1c4b-4281-b951-d872f2087c98
* Custom "menus" for the bookmark bar folders. jrg@chromium.org2010-02-241-16/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Full behavior: http://JRG_WRITE_FULL_DOC_AND_TEST_PLAN_TOMORROW BUG=17608 (and a slew of others) Brief details on how to test: - add some bookmarks and bookmark folders. - at a basic level, make sure bookmark folders feel like menus e.g. -- click to open -- can open "submenus" and sub-sub-menus -- can open (click on) bookmarks in any of these submenus - click-drag does NOT open a menu (different than Mac menus); it initiates a Drag - click on folder in bookmark bar initiates "hover open"; moving mouse over other folders will pop them open immediately (much like Mac menus) - Bookmark bar non-drag hover-open is immediate, but bookmark folder hover-open has a brief delay so quick "move down" a folder does not trigger them all to open while you travel (much like Mac menus). - DnD of bookmarks and folders on bookmark bar. - While doing DnD of bookmark, "hover" over a folder and see it open. - Bookmark folder menus have normal DnD "drop indicators" like the bookmark bar. - Can "hover open" a nested subfolder. - Can drag a bookmark from one deep sub-sub-folder to a different deep one. - Confirm buttons and folders in submenus are themed, both with the theme set at launch time and the theme we change to after launch. - Empty folders have an "(empty)" item which is not selectable. - Intentional delay in closing a sub-sub-folder when hovering over another one. E.g. When moving to a sub-sub-menu, 'brief' travel over a different submenu does not close the destination sub-menu. - can use bookmark context menus in folder "menus". - confirm DnD from "Other bookmarks" to any other random folder and vice versa. - While non-drag hover open is active, clicking anywhere other than the bookmark bar or folder (e.g. the main web view) turns it off. TODO: - random bugs (e.g. "add folder" over a folder doesn't put it in there) - (empty) needs to be revisited, both visually and for a drop indication - core animations instead of drop indicators - ... Review URL: http://codereview.chromium.org/551226 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39947 0039d316-1c4b-4281-b951-d872f2087c98
* Reverting the revert, reinstating 39825. ↵avi@chromium.org2010-02-241-13/+19
| | | | | | FindBarTextFieldCellTest.FocusedDisplay is flaky. git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39834 0039d316-1c4b-4281-b951-d872f2087c98
* Reverting r39825.avi@chromium.org2010-02-241-19/+13
| | | | git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39830 0039d316-1c4b-4281-b951-d872f2087c98
* Next batch of changes to kill GTMTheme.avi@chromium.org2010-02-241-13/+19
| | | | | | | | | | BUG=http://crbug.com/35554 TEST=no visible change in normal mode; incognito mode still being worked on Review URL: http://codereview.chromium.org/652179 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@39825 0039d316-1c4b-4281-b951-d872f2087c98
* [Mac] GTMTheme is going to die!thomasvl@chromium.org2010-02-121-1/+1
| | | | | | | | | | | | - DEPS roll to pick up new GTM without GTMTheme - GTMTheme within chrome until someone gets the cycles to completely remove it and use the core chrome theme objects - Update all the includes of GTMTheme for the new copy. BUG=35554 TEST=everything still builds/works Review URL: http://codereview.chromium.org/596095 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38921 0039d316-1c4b-4281-b951-d872f2087c98
* Mac: allow bookmark bar buttons to be dragged as URLs.viettrungluu@chromium.org2009-12-011-10/+13
| | | | | | | | | | | | | TODO #1: dragging of folder buttons. TODO #2: perhaps holding Option while dragging on the bookmark bar should force the bookmark to be copied instead of moved. BUG=17608, 28842 TEST=Make a bunch of (non-folder) bookmarks on the bookmark bar; try dragging these bookmark bar buttons to the desktop, to the web content area, to text boxes, to other browsers -- these should all do sensible things; make sure that dragging them around on the bookmark bar still rearranges them. Review URL: http://codereview.chromium.org/434095 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33478 0039d316-1c4b-4281-b951-d872f2087c98
* Mac: give visual feedback for bookmark button drags.viettrungluu@chromium.org2009-11-251-1/+60
| | | | | | | | | | | | | | | Draw a "ugly black bar" (where "black" is actually a theme colour) to indicate where a bookmark button that's being dragged will end up if dropped. This is a stopgap measure for the beta. Later, we will make the buttons move around instead (even if implementable in the time remaining, such animations would be a crash risk). BUG=17608 TEST=Drag bookmark bar buttons around. Make sure that the bar indicating where a button will be dropped is visible enough and accurate. Repeat with various themes. Review URL: http://codereview.chromium.org/437051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@33079 0039d316-1c4b-4281-b951-d872f2087c98
* Apply theme color to bookmark button text.jrg@chromium.org2009-11-201-3/+6
| | | | | | | | | | | | | | | | BUG=http://crbug.com/17608 TEST=Add some bookmarks (you must use both folders and marks). Apply a theme and make sure theme color applies bookmark button text for all buttons (including "Other bookmarks"). Create new window and make sure bookmark buttons still fine in new window. Quit and restart Chrome. Make sure theme color still applied to bookmark button text in the same way as before quitting (e.g. same color and still applies to all). Change theme 1 more time and verify color. Review URL: http://codereview.chromium.org/424004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32690 0039d316-1c4b-4281-b951-d872f2087c98
* Drag and drop of buttons/folders from bar to bar.jrg@chromium.org2009-11-181-6/+52
| | | | | | | | | | | | | | | | Does not include DnD to/from menus. No animations of drop destination yet. BUG=http://crbug.com/17608 TEST=Do some draggin and droppin. Confirm click still works on the marks and folders. Confirm "other bookmarks" canNOT be moved. Confirm NTP / detached bar also works for DnD. Review URL: http://codereview.chromium.org/395031 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32341 0039d316-1c4b-4281-b951-d872f2087c98
* Address post-commit comments from codereview.chromium.org/371059 and ↵thakis@chromium.org2009-11-121-0/+3
| | | | | | | | | | codereview.chromium.org/293019 TEST=BUG=none Review URL: http://codereview.chromium.org/389016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31801 0039d316-1c4b-4281-b951-d872f2087c98
* [Mac] Make bookmark bar primitive drag destination.thakis@chromium.org2009-10-241-0/+48
| | | | | | | | | | | | | | Credits for the bookmark bar fix to dmac; stolen from http://codereview.chromium.org/267082 . BUG=18289 TEST=Drag a link or bookmarklet from the web to the bookmark bar. It should be added at the end of the bar. Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=29906 Reverted: http://src.chromium.org/viewvc/chrome?view=rev&revision=29908 Review URL: http://codereview.chromium.org/336001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29990 0039d316-1c4b-4281-b951-d872f2087c98
* TBR: nsylvainthakis@chromium.org2009-10-231-57/+0
| | | | | | Revert git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29908 0039d316-1c4b-4281-b951-d872f2087c98
* [Mac] Make bookmark bar primitive drag destination.thakis@chromium.org2009-10-231-0/+57
| | | | | | | | | BUG=18289 TEST=Drag a link or bookmarklet from the web to the bookmark bar. It should be added at the end of the bar. Review URL: http://codereview.chromium.org/336001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29906 0039d316-1c4b-4281-b951-d872f2087c98
* Mac: colorize the "bookmarks go here" text to match the theme.avi@chromium.org2009-10-141-0/+35
| | | | | | | | | BUG=http://crbug.com/23536 TEST=as in bug Review URL: http://codereview.chromium.org/278008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29025 0039d316-1c4b-4281-b951-d872f2087c98
* Mac: Empty bookmark bar should show IDS_BOOKMARKS_NO_ITEMS.erg@chromium.org2009-09-221-0/+4
| | | | | | | | | | TEST=BookmarkBarControllerTest.DisplaysHelpMessageOnEmpty TEST=BookmarkBarControllerTest.HidesHelpMessageWithBookmark BUG=17360 Review URL: http://codereview.chromium.org/216052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@26853 0039d316-1c4b-4281-b951-d872f2087c98
* Prevent mouse down events in the bookmark bar and download shelf from movingpaul@chromium.org2009-08-141-0/+15
| | | | | | | | | | | | the parent window around. BUG=19305 (http://crbug.com/19305) TEST=Make the download shelf and/or bookmark bar visible. Clicking and dragging on either one should not move the window around. Review URL: http://codereview.chromium.org/165500 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@23409 0039d316-1c4b-4281-b951-d872f2087c98
* Added menus for bookmark bar folders. This is NOT based on the Colejrg@chromium.org2009-07-231-22/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | prototype; it is an attempt to get something functional in the short term, and have a visual baseline before doing something new. Added folder icons for bookmark bar folder buttons. Added an "off the side" button/menu for bookmark buttons which don't fit on the bar. Updated "Add page..." item to allow creating bookmarks in the folders (if selected over a folder button). BUG=http://crbug.com/8381 TEST=Here we go: 1) Make sure bookmark bar folders have the "folder" icon. 2) Right click on a folder --> Add Page, and add a bookmark. Make sure bookmark is now in the folder, not at the top level. 3) (Oh, you just implicitly verified you can open bookmark folders!) 4) Add 5 bookmarks then shrink the window thinner so all bookmark buttons don't fit. Make sure "off the right" button gets enabled (on right side of bar) and shows bookmarks in a pop-up menu (when clicked) that don't completely fit on the bar. 5) Make it super-wide so the all fit and make sure "off the right" button is disabled. 6) Add a bunch of bookmarks to a folder; make sure they all work. 7) Add nested folders (by editing the bookmark pref file and restarting Chrome) and make sure bookmark folder buttons have nested/cascading menus. Review URL: http://codereview.chromium.org/159286 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@21479 0039d316-1c4b-4281-b951-d872f2087c98
* More bookmark bar changes.jrg@chromium.org2009-07-141-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Applied memory cleanliness fix in unit test; follow-up from http://codereview.chromium.org/149308. * Move bookmark bar into it's own nib; minor code refactor to accomodate. * The toolbar STAR button somehow lost it's action; added it back in. * Implemented delete bookmark notification callback so we behave (remove button from the screen) when a bookmark is deleted. * Added context menus for the bookmark bar and bookmark buttons. * Hooked up a handful of these menu items. E.g. - open in new tab, window, incog window - delete bookmark (finally) - bookmark manager (which then hits a NOTIMPLEMENTED()) - always show bookmark bar * Truncate bookmark button text on end, not on middle. Experimental to look more like Windows. It looks cleaner but is less Mac-like. * Add "draws border when mouse goes over" for bookmark buttons. Need to do it by hand since we have a custom button drawing method. BUG=crbug.com/8381 TEST=Here's a list: - Make sure the bookmark buttons don't have a border unless the mouse is over them - Toolbar "STAR" should now add bookmarks when clicked - Test context menus on bookmark buttons, and the bar itself - Confirm a few of the behaviors as listed in the 'what I hooked up'; e.g. Right click on bookmark --> delete menu item should delete button Review URL: http://codereview.chromium.org/155358 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20591 0039d316-1c4b-4281-b951-d872f2087c98
* Bookmark bar, now with buttons.jrg@chromium.org2009-06-081-0/+8
Much of this CL is refactoring; it's not as large as it looks. (Do I always claim that? It's really true this time.) Review URL: http://codereview.chromium.org/115150 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17872 0039d316-1c4b-4281-b951-d872f2087c98