| Index: content/browser/web_contents/web_contents_impl.h
|
| diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
|
| index dd998c61356508faa31a8db7e7e2cffa91c403f8..134b8d8860b4d24bf5cf734fb16ecbec2f22636b 100644
|
| --- a/content/browser/web_contents/web_contents_impl.h
|
| +++ b/content/browser/web_contents/web_contents_impl.h
|
| @@ -31,13 +31,13 @@
|
| #include "content/public/browser/notification_observer.h"
|
| #include "content/public/browser/notification_registrar.h"
|
| #include "content/public/browser/web_contents.h"
|
| -#include "content/public/common/page_transition_types.h"
|
| #include "content/public/common/renderer_preferences.h"
|
| #include "content/public/common/resource_type.h"
|
| #include "content/public/common/three_d_api_types.h"
|
| #include "net/base/load_states.h"
|
| #include "net/http/http_response_headers.h"
|
| #include "third_party/WebKit/public/web/WebDragOperation.h"
|
| +#include "ui/base/page_transition_types.h"
|
| #include "ui/gfx/rect_f.h"
|
| #include "ui/gfx/size.h"
|
|
|
| @@ -508,7 +508,7 @@ class CONTENT_EXPORT WebContentsImpl
|
| virtual void DidCommitProvisionalLoad(
|
| RenderFrameHostImpl* render_frame_host,
|
| const GURL& url,
|
| - PageTransition transition_type) OVERRIDE;
|
| + ui::PageTransition transition_type) OVERRIDE;
|
| virtual void DidNavigateMainFramePreCommit(
|
| bool navigation_is_within_page) OVERRIDE;
|
| virtual void DidNavigateMainFramePostCommit(
|
|
|