diff options
| author | mrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 02:49:06 +0000 |
|---|---|---|
| committer | mrossetti@chromium.org <mrossetti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 02:49:06 +0000 |
| commit | a319876d697104c82098cac206e06dfba12a2a1c (patch) | |
| tree | 644a81e9899e65d59ed4d6dc0ef2b218bc24edbf | |
| parent | b6a3498936575542aa76c403c08aca732b20de41 (diff) | |
| download | chromium_src-a319876d697104c82098cac206e06dfba12a2a1c.zip chromium_src-a319876d697104c82098cac206e06dfba12a2a1c.tar.gz chromium_src-a319876d697104c82098cac206e06dfba12a2a1c.tar.bz2 | |
Cleanup.
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
| -rw-r--r-- | chrome/browser/cocoa/bookmark_bar_folder_view.mm | 3 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmark_bar_view.mm | 3 | ||||
| -rw-r--r-- | chrome/browser/cocoa/bookmark_button.h | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/chrome/browser/cocoa/bookmark_bar_folder_view.mm b/chrome/browser/cocoa/bookmark_bar_folder_view.mm index 6f0db17..9ede01b 100644 --- a/chrome/browser/cocoa/bookmark_bar_folder_view.mm +++ b/chrome/browser/cocoa/bookmark_bar_folder_view.mm @@ -158,8 +158,7 @@ if (data && [info draggingSource]) { BookmarkButton* button = nil; [data getBytes:&button length:sizeof(button)]; - BOOL copy = - [info draggingSourceOperationMask] & NSDragOperationMove ? NO : YES; + BOOL copy = !([info draggingSourceOperationMask] & NSDragOperationMove); doDrag = [[self controller] dragButton:button to:[info draggingLocation] copy:copy]; diff --git a/chrome/browser/cocoa/bookmark_bar_view.mm b/chrome/browser/cocoa/bookmark_bar_view.mm index 9e47614..1f2e417 100644 --- a/chrome/browser/cocoa/bookmark_bar_view.mm +++ b/chrome/browser/cocoa/bookmark_bar_view.mm @@ -220,8 +220,7 @@ if (data && [info draggingSource]) { BookmarkButton* button = nil; [data getBytes:&button length:sizeof(button)]; - BOOL copy = - [info draggingSourceOperationMask] & NSDragOperationMove ? NO : YES; + BOOL copy = !([info draggingSourceOperationMask] & NSDragOperationMove); rtn = [controller_ dragButton:button to:[info draggingLocation] copy:copy]; diff --git a/chrome/browser/cocoa/bookmark_button.h b/chrome/browser/cocoa/bookmark_button.h index 0bc1994..ddc0500 100644 --- a/chrome/browser/cocoa/bookmark_button.h +++ b/chrome/browser/cocoa/bookmark_button.h @@ -59,7 +59,7 @@ class ThemeProvider; // made and inserted into the new location while leaving the bookmark in // the old location, otherwise move the bookmark by removing from its old // location and inserting into the new location. -- (BOOL)dragButton:(BookmarkButton *)sourceButton +- (BOOL)dragButton:(BookmarkButton*)sourceButton to:(NSPoint)point copy:(BOOL)copy; |