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

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

Issue 2771233002: Remove the wrapper functions content::RecordAction et al (Closed)
Patch Set: Rebased Created 3 years, 8 months 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
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_view_cocoa.h" 5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_view_cocoa.h"
6 6
7 #include "base/metrics/user_metrics.h"
7 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
8 #import "chrome/browser/themes/theme_properties.h" 9 #import "chrome/browser/themes/theme_properties.h"
9 #import "chrome/browser/themes/theme_service.h" 10 #import "chrome/browser/themes/theme_service.h"
10 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" 11 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
11 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h" 12 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
12 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controlle r.h" 13 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_context_menu_cocoa_controlle r.h"
13 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h" 14 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
14 #import "chrome/browser/ui/cocoa/browser_window_controller.h" 15 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
15 #import "chrome/browser/ui/cocoa/themed_window.h" 16 #import "chrome/browser/ui/cocoa/themed_window.h"
16 #import "chrome/browser/ui/cocoa/view_id_util.h" 17 #import "chrome/browser/ui/cocoa/view_id_util.h"
17 #include "chrome/grit/generated_resources.h" 18 #include "chrome/grit/generated_resources.h"
18 #include "components/bookmarks/browser/bookmark_pasteboard_helper_mac.h" 19 #include "components/bookmarks/browser/bookmark_pasteboard_helper_mac.h"
19 #include "components/bookmarks/browser/bookmark_utils.h" 20 #include "components/bookmarks/browser/bookmark_utils.h"
20 #include "content/public/browser/user_metrics.h"
21 #import "third_party/mozilla/NSPasteboard+Utils.h" 21 #import "third_party/mozilla/NSPasteboard+Utils.h"
22 #include "ui/base/clipboard/clipboard_util_mac.h" 22 #include "ui/base/clipboard/clipboard_util_mac.h"
23 #import "ui/base/cocoa/controls/hyperlink_button_cell.h" 23 #import "ui/base/cocoa/controls/hyperlink_button_cell.h"
24 #import "ui/base/cocoa/nsview_additions.h" 24 #import "ui/base/cocoa/nsview_additions.h"
25 #include "ui/base/l10n/l10n_util_mac.h" 25 #include "ui/base/l10n/l10n_util_mac.h"
26 26
27 using base::UserMetricsAction; 27 using base::UserMetricsAction;
28 using bookmarks::BookmarkModel; 28 using bookmarks::BookmarkModel;
29 using bookmarks::BookmarkNode; 29 using bookmarks::BookmarkNode;
30 30
(...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after
317 const BookmarkNode* const source_node = [button bookmarkNode]; 317 const BookmarkNode* const source_node = [button bookmarkNode];
318 const BookmarkNode* const target_node = 318 const BookmarkNode* const target_node =
319 bookmarks::GetBookmarkNodeByID(model, source_node->id()); 319 bookmarks::GetBookmarkNodeByID(model, source_node->id());
320 320
321 BOOL copy = 321 BOOL copy =
322 !([info draggingSourceOperationMask] & NSDragOperationMove) || 322 !([info draggingSourceOperationMask] & NSDragOperationMove) ||
323 (source_node != target_node); 323 (source_node != target_node);
324 rtn = [controller_ dragButton:button 324 rtn = [controller_ dragButton:button
325 to:[info draggingLocation] 325 to:[info draggingLocation]
326 copy:copy]; 326 copy:copy];
327 content::RecordAction(UserMetricsAction("BookmarkBar_DragEnd")); 327 base::RecordAction(UserMetricsAction("BookmarkBar_DragEnd"));
328 } 328 }
329 return rtn; 329 return rtn;
330 } 330 }
331 331
332 - (BOOL)performDragOperation:(id<NSDraggingInfo>)info { 332 - (BOOL)performDragOperation:(id<NSDraggingInfo>)info {
333 if ([controller_ dragBookmarkData:info]) 333 if ([controller_ dragBookmarkData:info])
334 return YES; 334 return YES;
335 NSPasteboard* pboard = [info draggingPasteboard]; 335 NSPasteboard* pboard = [info draggingPasteboard];
336 if ([pboard dataForType:ui::ClipboardUtil::UTIForPasteboardType( 336 if ([pboard dataForType:ui::ClipboardUtil::UTIForPasteboardType(
337 kBookmarkButtonDragType)]) { 337 kBookmarkButtonDragType)]) {
(...skipping 10 matching lines...) Expand all
348 348
349 - (NSMenu*)menu { 349 - (NSMenu*)menu {
350 return [[controller_ menuController] menuForBookmarkBar]; 350 return [[controller_ menuController] menuForBookmarkBar];
351 } 351 }
352 352
353 - (ViewID)viewID { 353 - (ViewID)viewID {
354 return VIEW_ID_BOOKMARK_BAR; 354 return VIEW_ID_BOOKMARK_BAR;
355 } 355 }
356 356
357 @end // @implementation BookmarkBarView 357 @end // @implementation BookmarkBarView
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698