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

Unified Diff: content/test/test_render_frame_host.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/content_browser_test_utils_internal.cc ('k') | content/test/test_render_frame_host.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/test_render_frame_host.h
diff --git a/content/test/test_render_frame_host.h b/content/test/test_render_frame_host.h
index ec6be4dc7fa4e9bf2266467497a2e4ee3b3fa712..8202b9a667cacb67f9af14429d09f91074684ad0 100644
--- a/content/test/test_render_frame_host.h
+++ b/content/test/test_render_frame_host.h
@@ -10,9 +10,9 @@
#include "base/basictypes.h"
#include "content/browser/frame_host/render_frame_host_impl.h"
#include "content/public/browser/web_contents_observer.h"
-#include "content/public/common/page_transition_types.h"
#include "content/public/test/test_renderer_host.h"
#include "content/test/test_render_view_host.h"
+#include "ui/base/page_transition_types.h"
struct FrameHostMsg_DidCommitProvisionalLoad_Params;
@@ -49,15 +49,16 @@ class TestRenderFrameHost : public RenderFrameHostImpl,
// RenderFrameHostTester implementation.
virtual TestRenderFrameHost* AppendChild(
const std::string& frame_name) OVERRIDE;
- virtual void SendNavigateWithTransition(int page_id,
- const GURL& url,
- PageTransition transition) OVERRIDE;
+ virtual void SendNavigateWithTransition(
+ int page_id,
+ const GURL& url,
+ ui::PageTransition transition) OVERRIDE;
void SendNavigate(int page_id, const GURL& url);
void SendFailedNavigate(int page_id, const GURL& url);
void SendNavigateWithTransitionAndResponseCode(
int page_id,
- const GURL& url, PageTransition transition,
+ const GURL& url, ui::PageTransition transition,
int response_code);
void SendNavigateWithOriginalRequestURL(
int page_id,
@@ -76,7 +77,7 @@ class TestRenderFrameHost : public RenderFrameHostImpl,
void SendNavigateWithParameters(
int page_id,
const GURL& url,
- PageTransition transition,
+ ui::PageTransition transition,
const GURL& original_request_url,
int response_code,
const base::FilePath* file_path_for_history_item,
« no previous file with comments | « content/test/content_browser_test_utils_internal.cc ('k') | content/test/test_render_frame_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698