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

Unified Diff: content/public/renderer/navigation_state.h

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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/common/page_transition_types.cc ('k') | content/public/renderer/navigation_state.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/public/renderer/navigation_state.h
===================================================================
--- content/public/renderer/navigation_state.h (revision 105162)
+++ content/public/renderer/navigation_state.h (working copy)
@@ -11,7 +11,7 @@
#include "base/logging.h"
#include "base/memory/scoped_ptr.h"
#include "base/time.h"
-#include "content/common/page_transition_types.h"
+#include "content/public/common/page_transition_types.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebURLRequest.h"
@@ -46,7 +46,7 @@
static NavigationState* CreateBrowserInitiated(
int32 pending_page_id,
int pending_history_list_offset,
- PageTransition::Type transition_type,
+ content::PageTransition transition_type,
base::Time request_time) {
return new NavigationState(transition_type, request_time, false,
pending_page_id,
@@ -55,8 +55,8 @@
static NavigationState* CreateContentInitiated() {
// We assume navigations initiated by content are link clicks.
- return new NavigationState(PageTransition::LINK, base::Time(), true, -1,
- -1);
+ return new NavigationState(
+ content::PAGE_TRANSITION_LINK, base::Time(), true, -1, -1);
}
static NavigationState* FromDataSource(WebKit::WebDataSource* ds) {
@@ -74,8 +74,8 @@
// Contains the transition type that the browser specified when it
// initiated the load.
- PageTransition::Type transition_type() const { return transition_type_; }
- void set_transition_type(PageTransition::Type type) {
+ content::PageTransition transition_type() const { return transition_type_; }
+ void set_transition_type(content::PageTransition type) {
transition_type_ = type;
}
@@ -264,13 +264,13 @@
}
private:
- NavigationState(PageTransition::Type transition_type,
+ NavigationState(content::PageTransition transition_type,
const base::Time& request_time,
bool is_content_initiated,
int32 pending_page_id,
int pending_history_list_offset);
- PageTransition::Type transition_type_;
+ content::PageTransition transition_type_;
LoadType load_type_;
base::Time request_time_;
base::Time start_load_time_;
« no previous file with comments | « content/public/common/page_transition_types.cc ('k') | content/public/renderer/navigation_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698