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

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_menu_cocoa_controller.h" 5 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_cocoa_controller.h"
6 6
7 #import "base/mac/foundation_util.h" 7 #import "base/mac/foundation_util.h"
8 #include "base/metrics/user_metrics.h"
8 #include "base/strings/sys_string_conversions.h" 9 #include "base/strings/sys_string_conversions.h"
9 #include "chrome/app/chrome_command_ids.h" // IDC_BOOKMARK_MENU 10 #include "chrome/app/chrome_command_ids.h" // IDC_BOOKMARK_MENU
10 #import "chrome/browser/app_controller_mac.h" 11 #import "chrome/browser/app_controller_mac.h"
11 #include "chrome/browser/profiles/profile.h" 12 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/ui/bookmarks/bookmark_utils.h" 13 #include "chrome/browser/ui/bookmarks/bookmark_utils.h"
13 #include "chrome/browser/ui/bookmarks/bookmark_utils_desktop.h" 14 #include "chrome/browser/ui/bookmarks/bookmark_utils_desktop.h"
14 #include "chrome/browser/ui/browser.h" 15 #include "chrome/browser/ui/browser.h"
15 #include "chrome/browser/ui/browser_finder.h" 16 #include "chrome/browser/ui/browser_finder.h"
16 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h" 17 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
17 #import "chrome/browser/ui/cocoa/l10n_util.h" 18 #import "chrome/browser/ui/cocoa/l10n_util.h"
18 #include "components/bookmarks/browser/bookmark_utils.h" 19 #include "components/bookmarks/browser/bookmark_utils.h"
19 #include "content/public/browser/user_metrics.h"
20 #import "ui/base/cocoa/cocoa_base_utils.h" 20 #import "ui/base/cocoa/cocoa_base_utils.h"
21 #import "ui/base/cocoa/menu_controller.h" 21 #import "ui/base/cocoa/menu_controller.h"
22 22
23 using base::UserMetricsAction; 23 using base::UserMetricsAction;
24 using bookmarks::BookmarkNode; 24 using bookmarks::BookmarkNode;
25 using content::OpenURLParams; 25 using content::OpenURLParams;
26 using content::Referrer; 26 using content::Referrer;
27 27
28 namespace { 28 namespace {
29 29
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 browser = new Browser(Browser::CreateParams(bridge_->GetProfile(), true)); 116 browser = new Browser(Browser::CreateParams(bridge_->GetProfile(), true));
117 } 117 }
118 DCHECK(browser); 118 DCHECK(browser);
119 119
120 if (!node || !browser) 120 if (!node || !browser)
121 return; // shouldn't be reached 121 return; // shouldn't be reached
122 122
123 chrome::OpenAll(NULL, browser, node, disposition, browser->profile()); 123 chrome::OpenAll(NULL, browser, node, disposition, browser->profile());
124 124
125 if (disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB) { 125 if (disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB) {
126 content::RecordAction(UserMetricsAction("OpenAllBookmarks")); 126 base::RecordAction(UserMetricsAction("OpenAllBookmarks"));
127 } else if (disposition == WindowOpenDisposition::NEW_WINDOW) { 127 } else if (disposition == WindowOpenDisposition::NEW_WINDOW) {
128 content::RecordAction(UserMetricsAction("OpenAllBookmarksNewWindow")); 128 base::RecordAction(UserMetricsAction("OpenAllBookmarksNewWindow"));
129 } else { 129 } else {
130 content::RecordAction( 130 base::RecordAction(UserMetricsAction("OpenAllBookmarksIncognitoWindow"));
131 UserMetricsAction("OpenAllBookmarksIncognitoWindow"));
132 } 131 }
133 } 132 }
134 133
135 - (IBAction)openBookmarkMenuItem:(id)sender { 134 - (IBAction)openBookmarkMenuItem:(id)sender {
136 NSInteger tag = [sender tag]; 135 NSInteger tag = [sender tag];
137 int identifier = tag; 136 int identifier = tag;
138 const BookmarkNode* node = [self nodeForIdentifier:identifier]; 137 const BookmarkNode* node = [self nodeForIdentifier:identifier];
139 DCHECK(node); 138 DCHECK(node);
140 if (!node) 139 if (!node)
141 return; // shouldn't be reached 140 return; // shouldn't be reached
(...skipping 10 matching lines...) Expand all
152 WindowOpenDisposition disposition = WindowOpenDisposition::NEW_WINDOW; 151 WindowOpenDisposition disposition = WindowOpenDisposition::NEW_WINDOW;
153 [self openAll:[sender tag] withDisposition:disposition]; 152 [self openAll:[sender tag] withDisposition:disposition];
154 } 153 }
155 154
156 - (IBAction)openAllBookmarksIncognitoWindow:(id)sender { 155 - (IBAction)openAllBookmarksIncognitoWindow:(id)sender {
157 WindowOpenDisposition disposition = WindowOpenDisposition::OFF_THE_RECORD; 156 WindowOpenDisposition disposition = WindowOpenDisposition::OFF_THE_RECORD;
158 [self openAll:[sender tag] withDisposition:disposition]; 157 [self openAll:[sender tag] withDisposition:disposition];
159 } 158 }
160 159
161 @end // BookmarkMenuCocoaController 160 @end // BookmarkMenuCocoaController
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/bookmarks/bookmark_button_cell.mm ('k') | chrome/browser/ui/cocoa/browser_window_command_handler.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698