Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2302)

Unified Diff: content/test/test_web_contents.cc

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 months 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 | « content/test/test_web_contents.h ('k') | extensions/browser/app_window/app_window_contents.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/test_web_contents.cc
diff --git a/content/test/test_web_contents.cc b/content/test/test_web_contents.cc
index a8ffafb733244aa8db18d0434546a683a89b178c..fdc3918b14ab4453ebe5165eba62d72821f8ad6e 100644
--- a/content/test/test_web_contents.cc
+++ b/content/test/test_web_contents.cc
@@ -18,9 +18,9 @@
#include "content/public/browser/notification_source.h"
#include "content/public/browser/notification_types.h"
#include "content/public/common/page_state.h"
-#include "content/public/common/page_transition_types.h"
#include "content/public/test/mock_render_process_host.h"
#include "content/test/test_render_view_host.h"
+#include "ui/base/page_transition_types.h"
namespace content {
@@ -61,7 +61,7 @@ TestRenderFrameHost* TestWebContents::GetPendingMainFrame() const {
void TestWebContents::TestDidNavigate(RenderFrameHost* render_frame_host,
int page_id,
const GURL& url,
- PageTransition transition) {
+ ui::PageTransition transition) {
TestDidNavigateWithReferrer(render_frame_host,
page_id,
url,
@@ -74,7 +74,7 @@ void TestWebContents::TestDidNavigateWithReferrer(
int page_id,
const GURL& url,
const Referrer& referrer,
- PageTransition transition) {
+ ui::PageTransition transition) {
FrameHostMsg_DidCommitProvisionalLoad_Params params;
params.page_id = page_id;
@@ -124,7 +124,7 @@ WebContents* TestWebContents::Clone() {
void TestWebContents::NavigateAndCommit(const GURL& url) {
GetController().LoadURL(
- url, Referrer(), PAGE_TRANSITION_LINK, std::string());
+ url, Referrer(), ui::PAGE_TRANSITION_LINK, std::string());
GURL loaded_url(url);
bool reverse_on_redirect = false;
BrowserURLHandlerImpl::GetInstance()->RewriteURLIfNecessary(
« no previous file with comments | « content/test/test_web_contents.h ('k') | extensions/browser/app_window/app_window_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698