chrome/browser/ui/webui/options/browser_options_handler.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/webui/options/browser_options_handler.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: 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/webui/options/advanced_options_handler.cc ('k') | chrome/browser/ui/webui/options/chromeos/core_chromeos_options_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/options/browser_options_handler.cc

diff --git a/chrome/browser/ui/webui/options/browser_options_handler.cc b/chrome/browser/ui/webui/options/browser_options_handler.cc

index d42aa300c5458810d5edf255b6abacf9a36da174..35467343cdcd2d8a06387b34f78edd79d409ab61 100644

--- a/chrome/browser/ui/webui/options/browser_options_handler.cc

+++ b/chrome/browser/ui/webui/options/browser_options_handler.cc

@@ -29,14 +29,16 @@

#include "chrome/common/chrome_notification_types.h"

#include "chrome/common/pref_names.h"

#include "chrome/common/url_constants.h"

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

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

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

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

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

#include "grit/chromium_strings.h"

#include "grit/generated_resources.h"

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

+using content::UserMetricsAction;

BrowserOptionsHandler::BrowserOptionsHandler()

: template_url_service_(NULL), startup_custom_pages_table_model_(NULL) {

#if !defined(OS_MACOSX)

@@ -184,7 +186,7 @@ void BrowserOptionsHandler::BecomeDefaultBrowser(const ListValue* args) {

if (default_browser_policy_.IsManaged())

return;

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

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

#if defined(OS_MACOSX)

if (ShellIntegration::SetAsDefaultBrowser())

UpdateDefaultBrowserState();

@@ -285,7 +287,7 @@ void BrowserOptionsHandler::SetDefaultSearchEngine(const ListValue* args) {

selected_index < static_cast<int>(model_urls.size()))

template_url_service_->SetDefaultSearchProvider(model_urls[selected_index]);

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

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

}

void BrowserOptionsHandler::UpdateSearchEngines() {