summaryrefslogtreecommitdiffstats
path: root/content/browser/tab_contents/navigation_controller.cc
diff options
context:
space:
mode:
authorjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-14 13:23:38 +0000
committerjoi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-14 13:23:38 +0000
commit7f6f44c9e44707612415d4c85cfe9924aeacd917 (patch)
tree167b6d29691a127ef3ab1ada5b6f9c774d99363d /content/browser/tab_contents/navigation_controller.cc
parent7af0889d30c9a27b916aa49d4bfea7ea92465072 (diff)
downloadchromium_src-7f6f44c9e44707612415d4c85cfe9924aeacd917.zip
chromium_src-7f6f44c9e44707612415d4c85cfe9924aeacd917.tar.gz
chromium_src-7f6f44c9e44707612415d4c85cfe9924aeacd917.tar.bz2
Split UserMetrics into API vs. implementation. Move API to content/public.
TBR=davemoore@chromium.org BUG=98716 Review URL: http://codereview.chromium.org/8919017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114416 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/tab_contents/navigation_controller.cc')
-rw-r--r--content/browser/tab_contents/navigation_controller.cc10
1 files changed, 6 insertions, 4 deletions
diff --git a/content/browser/tab_contents/navigation_controller.cc b/content/browser/tab_contents/navigation_controller.cc
index f69efe1..b2718ea 100644
--- a/content/browser/tab_contents/navigation_controller.cc
+++ b/content/browser/tab_contents/navigation_controller.cc
@@ -21,16 +21,18 @@
#include "content/browser/tab_contents/navigation_entry.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/common/content_constants.h"
#include "content/common/view_messages.h"
+#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_types.h"
+#include "content/public/browser/user_metrics.h"
+#include "content/public/common/content_constants.h"
#include "net/base/escape.h"
#include "net/base/mime_util.h"
#include "net/base/net_util.h"
#include "webkit/glue/webkit_glue.h"
+using content::UserMetricsAction;
+
namespace {
const int kInvalidateAll = 0xFFFFFFFF;
@@ -695,7 +697,7 @@ content::NavigationType NavigationController::ClassifyNavigation(
// Because the unknown entry has committed, we risk showing the wrong URL in
// release builds. Instead, we'll kill the renderer process to be safe.
LOG(ERROR) << "terminating renderer for bad navigation: " << params.url;
- UserMetrics::RecordAction(UserMetricsAction("BadMessageTerminate_NC"));
+ content::RecordAction(UserMetricsAction("BadMessageTerminate_NC"));
// Temporary code so we can get more information. Format:
// http://url/foo.html#page1#max3#frame1#ids:2_Nx,1_1x,3_2