chrome/browser/ui/content_settings/content_setting_bubble_model.cc - 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/content_settings/content_setting_bubble_model.cc

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: Move to content namespace. Update usages. Update extract_actions tool. 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/wrench_menu/wrench_menu_controller.mm ('k') | chrome/browser/ui/fullscreen_controller.cc » ('j') | content/browser/user_metrics.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/content_settings/content_setting_bubble_model.cc

diff --git a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

index ba5b3569d123638f5d95ea201ee24b4554b2ac80..4e4ae0aee56a67c57ef695a989f583b820c41bca 100644

--- a/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

+++ b/chrome/browser/ui/content_settings/content_setting_bubble_model.cc

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

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

#include "chrome/browser/ui/collected_cookies_infobar_delegate.h"

#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

-#include "chrome/common/content_settings.h"

#include "chrome/common/chrome_notification_types.h"

+#include "chrome/common/content_settings.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/render_messages.h"

#include "content/browser/renderer_host/render_view_host.h"

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

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

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

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

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

#include "grit/generated_resources.h"

#include "net/base/net_util.h"

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

+using content::UserMetricsAction;

using content_settings::SettingInfo;

using content_settings::SettingSource;

using content_settings::SETTING_SOURCE_USER;

@@ -377,7 +378,7 @@ class ContentSettingPluginBubbleModel : public ContentSettingSingleRadioGroup {

private:

virtual void OnCustomLinkClicked() OVERRIDE {

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

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

DCHECK(tab_contents());

RenderViewHost* host = tab_contents()->render_view_host();

host->Send(new ChromeViewMsg_LoadBlockedPlugins(host->routing_id()));