diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 03:51:58 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-13 03:51:58 +0000 |
| commit | 2905f74ce902dbf21dcbbf7ed3537f803f027630 (patch) | |
| tree | 0371f49d1768902bf69e0130b55ec104258f5cf9 /chrome/browser/bookmarks | |
| parent | 49098f7091448e437190f23cc67a705df4abd079 (diff) | |
| download | chromium_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/bookmarks')
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_model_unittest.cc | 2 | ||||
| -rw-r--r-- | chrome/browser/bookmarks/bookmark_utils.cc | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc index f9e8b5e..30ab892 100644 --- a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc @@ -30,7 +30,7 @@ class TestingPageNavigator : public PageNavigator { virtual TabContents* OpenURL(const GURL& url, const GURL& referrer, WindowOpenDisposition disposition, - PageTransition::Type transition) OVERRIDE { + content::PageTransition transition) OVERRIDE { return OpenURL(OpenURLParams(url, referrer, disposition, transition)); } diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc index 807243a..60936a9 100644 --- a/chrome/browser/bookmarks/bookmark_model_unittest.cc +++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc @@ -973,7 +973,7 @@ TEST_F(BookmarkModelTestWithProfile2, RemoveNotification) { bookmark_utils::AddIfNotBookmarked(bb_model_, url, string16()); profile_->GetHistoryService(Profile::EXPLICIT_ACCESS)->AddPage( - url, NULL, 1, GURL(), PageTransition::TYPED, + url, NULL, 1, GURL(), content::PAGE_TRANSITION_TYPED, history::RedirectList(), history::SOURCE_BROWSED, false); // This won't actually delete the URL, rather it'll empty out the visits. diff --git a/chrome/browser/bookmarks/bookmark_utils.cc b/chrome/browser/bookmarks/bookmark_utils.cc index 45c9a2c..d015779 100644 --- a/chrome/browser/bookmarks/bookmark_utils.cc +++ b/chrome/browser/bookmarks/bookmark_utils.cc @@ -75,7 +75,7 @@ class NewBrowserPageNavigator : public PageNavigator { virtual TabContents* OpenURL(const GURL& url, const GURL& referrer, WindowOpenDisposition disposition, - PageTransition::Type transition) OVERRIDE { + content::PageTransition transition) OVERRIDE { return OpenURL(OpenURLParams(url, referrer, disposition, transition)); } @@ -154,7 +154,7 @@ void OpenAllImpl(const BookmarkNode* node, else disposition = initial_disposition; (*navigator)->OpenURL(OpenURLParams(node->url(), GURL(), disposition, - PageTransition::AUTO_BOOKMARK)); + content::PAGE_TRANSITION_AUTO_BOOKMARK)); if (!*opened_url) { *opened_url = true; // We opened the first URL which may have opened a new window or clobbered |