chrome/browser/ui/cocoa/tabs/tab_strip_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/tabs/tab_strip_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/importer/import_lock_dialog_cocoa.mm ('k') | chrome/browser/ui/cocoa/wrench_menu/wrench_menu_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

index d9b9abf12f6209156f9dea7dcd8eeed1e5b2c84d..8f17a7c1b42e78a4f07f025e055fc048ec4076ef 100644

--- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

+++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm

@@ -55,7 +55,7 @@

#include "content/browser/tab_contents/navigation_entry.h"

#include "content/browser/tab_contents/tab_contents.h"

#include "content/browser/tab_contents/tab_contents_view.h"

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

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

#include "grit/generated_resources.h"

#include "grit/theme_resources.h"

#include "grit/theme_resources_standard.h"

@@ -67,6 +67,8 @@

#include "ui/gfx/image/image.h"

#include "ui/gfx/mac/nsimage_cache.h"

+using content::UserMetricsAction;

NSString* const kTabStripNumberOfTabsChanged = @"kTabStripNumberOfTabsChanged";

namespace {

@@ -695,7 +697,7 @@ private:

if (!tabStripModel_->ContainsIndex(index))

return;

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

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

const NSInteger numberOfOpenTabs = [self numberOfOpenTabs];

if (numberOfOpenTabs > 1) {

bool isClosingLastTab = index == numberOfOpenTabs - 1;

@@ -1832,7 +1834,7 @@ private:

// Either insert a new tab or open in a current tab.

switch (disposition) {

case NEW_FOREGROUND_TAB: {

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

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

browser::NavigateParams params(

browser_, *url, content::PAGE_TRANSITION_TYPED);

params.disposition = disposition;

@@ -1843,7 +1845,7 @@ private:

break;

}

case CURRENT_TAB:

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

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

tabStripModel_->GetTabContentsAt(index)

->tab_contents()->OpenURL(*url, GURL(), CURRENT_TAB,

content::PAGE_TRANSITION_TYPED);