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

Unified Diff: content/test/test_web_contents.h

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_render_view_host.cc ('k') | content/test/test_web_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.h
diff --git a/content/test/test_web_contents.h b/content/test/test_web_contents.h
index 2daf7f362b0b4691a52a5f63012bf713f4e1b46d..8771af105bf0069fefce6b4906146e46ae6fba5e 100644
--- a/content/test/test_web_contents.h
+++ b/content/test/test_web_contents.h
@@ -6,11 +6,11 @@
#define CONTENT_TEST_TEST_WEB_CONTENTS_H_
#include "content/browser/web_contents/web_contents_impl.h"
-#include "content/public/common/page_transition_types.h"
#include "content/public/common/web_preferences.h"
#include "content/public/test/web_contents_tester.h"
#include "content/test/test_render_frame_host.h"
#include "content/test/test_render_view_host.h"
+#include "ui/base/page_transition_types.h"
class SiteInstanceImpl;
@@ -42,12 +42,13 @@ class TestWebContents : public WebContentsImpl, public WebContentsTester {
virtual void TestDidNavigate(RenderFrameHost* render_frame_host,
int page_id,
const GURL& url,
- PageTransition transition) OVERRIDE;
- virtual void TestDidNavigateWithReferrer(RenderFrameHost* render_frame_host,
- int page_id,
- const GURL& url,
- const Referrer& referrer,
- PageTransition transition) OVERRIDE;
+ ui::PageTransition transition) OVERRIDE;
+ virtual void TestDidNavigateWithReferrer(
+ RenderFrameHost* render_frame_host,
+ int page_id,
+ const GURL& url,
+ const Referrer& referrer,
+ ui::PageTransition transition) OVERRIDE;
virtual WebPreferences TestComputeWebkitPrefs() OVERRIDE;
// State accessor.
« no previous file with comments | « content/test/test_render_view_host.cc ('k') | content/test/test_web_contents.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698