Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(336)

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.mm

Issue 8919017: Split UserMetrics into API vs. implementation. Move API to content/public. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Version for commit (merged again). Created 9 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h" 5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_view.h"
6 6
7 #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h" 7 #include "chrome/browser/bookmarks/bookmark_pasteboard_helper_mac.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" 9 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
10 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h" 10 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
11 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 11 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
12 #include "content/browser/user_metrics.h" 12 #include "content/public/browser/user_metrics.h"
13
14 using content::UserMetricsAction;
13 15
14 #import "third_party/mozilla/NSPasteboard+Utils.h" 16 #import "third_party/mozilla/NSPasteboard+Utils.h"
15 17
16 @interface BookmarkBarFolderView() 18 @interface BookmarkBarFolderView()
17 19
18 @property(readonly, nonatomic) id<BookmarkButtonControllerProtocol> controller; 20 @property(readonly, nonatomic) id<BookmarkButtonControllerProtocol> controller;
19 21
20 @end 22 @end
21 23
22 @implementation BookmarkBarFolderView 24 @implementation BookmarkBarFolderView
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
196 const BookmarkNode* const source_node = [button bookmarkNode]; 198 const BookmarkNode* const source_node = [button bookmarkNode];
197 const BookmarkNode* const target_node = 199 const BookmarkNode* const target_node =
198 model->GetNodeByID(source_node->id()); 200 model->GetNodeByID(source_node->id());
199 201
200 BOOL copy = 202 BOOL copy =
201 !([info draggingSourceOperationMask] & NSDragOperationMove) || 203 !([info draggingSourceOperationMask] & NSDragOperationMove) ||
202 (source_node != target_node); 204 (source_node != target_node);
203 doDrag = [[self controller] dragButton:button 205 doDrag = [[self controller] dragButton:button
204 to:[info draggingLocation] 206 to:[info draggingLocation]
205 copy:copy]; 207 copy:copy];
206 UserMetrics::RecordAction(UserMetricsAction("BookmarkBarFolder_DragEnd")); 208 content::RecordAction(UserMetricsAction("BookmarkBarFolder_DragEnd"));
207 } 209 }
208 return doDrag; 210 return doDrag;
209 } 211 }
210 212
211 - (BOOL)performDragOperation:(id<NSDraggingInfo>)info { 213 - (BOOL)performDragOperation:(id<NSDraggingInfo>)info {
212 if ([[self controller] dragBookmarkData:info]) 214 if ([[self controller] dragBookmarkData:info])
213 return YES; 215 return YES;
214 NSPasteboard* pboard = [info draggingPasteboard]; 216 NSPasteboard* pboard = [info draggingPasteboard];
215 if ([pboard dataForType:kBookmarkButtonDragType] && 217 if ([pboard dataForType:kBookmarkButtonDragType] &&
216 [self performDragOperationForBookmarkButton:info]) 218 [self performDragOperationForBookmarkButton:info])
217 return YES; 219 return YES;
218 if ([pboard containsURLData] && [self performDragOperationForURL:info]) 220 if ([pboard containsURLData] && [self performDragOperationForURL:info])
219 return YES; 221 return YES;
220 return NO; 222 return NO;
221 } 223 }
222 224
223 @end 225 @end
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.mm ('k') | chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698