summaryrefslogtreecommitdiffstats
path: root/chrome/browser/rlz
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-13 03:51:58 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-13 03:51:58 +0000
commit2905f74ce902dbf21dcbbf7ed3537f803f027630 (patch)
tree0371f49d1768902bf69e0130b55ec104258f5cf9 /chrome/browser/rlz
parent49098f7091448e437190f23cc67a705df4abd079 (diff)
downloadchromium_src-2905f74ce902dbf21dcbbf7ed3537f803f027630.zip
chromium_src-2905f74ce902dbf21dcbbf7ed3537f803f027630.tar.gz
chromium_src-2905f74ce902dbf21dcbbf7ed3537f803f027630.tar.bz2
Move PageTransition into content namespace. While I'm touching all these files, I've also updated it to use the enum naming convention in the Content API.
BUG=98716 Review URL: http://codereview.chromium.org/8253002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105254 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/rlz')
-rw-r--r--chrome/browser/rlz/rlz.cc3
-rw-r--r--chrome/browser/rlz/rlz_unittest.cc4
2 files changed, 4 insertions, 3 deletions
diff --git a/chrome/browser/rlz/rlz.cc b/chrome/browser/rlz/rlz.cc
index 9c59f64..0c38cce 100644
--- a/chrome/browser/rlz/rlz.cc
+++ b/chrome/browser/rlz/rlz.cc
@@ -298,7 +298,8 @@ void RLZTracker::Observe(int type,
case content::NOTIFICATION_NAV_ENTRY_PENDING: {
const NavigationEntry* entry = Details<NavigationEntry>(details).ptr();
if (entry != NULL &&
- ((entry->transition_type() & PageTransition::HOME_PAGE) != 0)) {
+ ((entry->transition_type() &
+ content::PAGE_TRANSITION_HOME_PAGE) != 0)) {
point = rlz_lib::CHROME_HOME_PAGE;
record_used = &homepage_used_;
call_record = true;
diff --git a/chrome/browser/rlz/rlz_unittest.cc b/chrome/browser/rlz/rlz_unittest.cc
index 1c0416a..020f232 100644
--- a/chrome/browser/rlz/rlz_unittest.cc
+++ b/chrome/browser/rlz/rlz_unittest.cc
@@ -206,7 +206,7 @@ void RlzLibTest::SimulateOmniboxUsage() {
void RlzLibTest::SimulateHomepageUsage() {
NavigationEntry entry(NULL, 0, GURL(), GURL(), string16(),
- PageTransition::HOME_PAGE);
+ content::PAGE_TRANSITION_HOME_PAGE);
tracker_.Observe(content::NOTIFICATION_NAV_ENTRY_PENDING,
NotificationService::AllSources(),
Details<NavigationEntry>(&entry));
@@ -541,7 +541,7 @@ TEST_F(RlzLibTest, PingUpdatesRlzCache) {
TEST_F(RlzLibTest, ObserveHandlesBadArgs) {
NavigationEntry entry(NULL, 0, GURL(), GURL(), string16(),
- PageTransition::LINK);
+ content::PAGE_TRANSITION_LINK);
tracker_.Observe(content::NOTIFICATION_NAV_ENTRY_PENDING,
NotificationService::AllSources(),
Details<NavigationEntry>(NULL));