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

Unified Diff: content/public/browser/web_contents_observer.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/public/browser/web_contents_delegate.cc ('k') | content/public/browser/web_ui.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/browser/web_contents_observer.h
diff --git a/content/public/browser/web_contents_observer.h b/content/public/browser/web_contents_observer.h
index 846bf94a4d5d13eb5690fce54e3e909b229fb3b9..af9593ec9baccb8aaece98a4605247b3ee6cbb90 100644
--- a/content/public/browser/web_contents_observer.h
+++ b/content/public/browser/web_contents_observer.h
@@ -10,10 +10,10 @@
#include "content/common/content_export.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/common/frame_navigate_params.h"
-#include "content/public/common/page_transition_types.h"
#include "ipc/ipc_listener.h"
#include "ipc/ipc_sender.h"
#include "third_party/skia/include/core/SkColor.h"
+#include "ui/base/page_transition_types.h"
#include "ui/base/window_open_disposition.h"
namespace content {
@@ -154,7 +154,7 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener,
virtual void DidCommitProvisionalLoadForFrame(
RenderFrameHost* render_frame_host,
const GURL& url,
- PageTransition transition_type) {}
+ ui::PageTransition transition_type) {}
// This method is invoked when the provisional load failed.
virtual void DidFailProvisionalLoad(
@@ -234,7 +234,7 @@ class CONTENT_EXPORT WebContentsObserver : public IPC::Listener,
const GURL& url,
const Referrer& referrer,
WindowOpenDisposition disposition,
- PageTransition transition,
+ ui::PageTransition transition,
int64 source_frame_id) {}
virtual void FrameDetached(RenderFrameHost* render_frame_host) {}
« no previous file with comments | « content/public/browser/web_contents_delegate.cc ('k') | content/public/browser/web_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698