chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm - Issue 8919017: Split UserMetrics into API vs. implementation. Move API to content/public.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm ('k') | chrome/browser/ui/content_settings/content_setting_bubble_model.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm

diff --git a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm

index 7ff900f7301624906e8cd3145710c850de69a08a..2f4d8721dced5f6188a9ad7b9b0f9507f956e75a 100644

--- a/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm

+++ b/chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm

@@ -19,17 +19,19 @@

#import "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"

#import "chrome/browser/ui/cocoa/wrench_menu/menu_tracked_root_view.h"

#include "chrome/browser/ui/toolbar/wrench_menu_model.h"

-#include "content/browser/user_metrics.h"

#include "content/public/browser/notification_observer.h"

#include "content/public/browser/notification_service.h"

#include "content/public/browser/notification_source.h"

#include "content/public/browser/notification_types.h"

+#include "content/public/browser/user_metrics.h"

#include "grit/chromium_strings.h"

#include "grit/generated_resources.h"

#include "ui/base/accelerators/accelerator_cocoa.h"

#include "ui/base/l10n/l10n_util.h"

#include "ui/base/models/menu_model.h"

+using content::UserMetricsAction;

@interface WrenchMenuController (Private)

- (void)createModel;

- (void)adjustPositioning;

@@ -168,7 +170,7 @@ class ZoomLevelObserver : public content::NotificationObserver {

[self wrenchMenuModel]->GetLabelForCommandId(IDC_ZOOM_PERCENT_DISPLAY));

[[[buttonViewController_ zoomItem] viewWithTag:IDC_ZOOM_PERCENT_DISPLAY]

setTitle:title];

- UserMetrics::RecordAction(UserMetricsAction("ShowAppMenu"));

+ content::RecordAction(UserMetricsAction("ShowAppMenu"));

NSImage* icon = [self wrenchMenuModel]->browser()->window()->IsFullscreen() ?

[NSImage imageNamed:NSImageNameExitFullScreenTemplate] :