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

Unified Diff: content/browser/tab_contents/navigation_entry.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
Index: content/browser/tab_contents/navigation_entry.h
===================================================================
--- content/browser/tab_contents/navigation_entry.h (revision 105162)
+++ content/browser/tab_contents/navigation_entry.h (working copy)
@@ -11,9 +11,9 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
#include "content/common/content_export.h"
-#include "content/common/page_transition_types.h"
#include "content/common/page_type.h"
#include "content/common/security_style.h"
+#include "content/public/common/page_transition_types.h"
#include "googleurl/src/gurl.h"
#include "net/base/cert_status_flags.h"
#include "third_party/skia/include/core/SkBitmap.h"
@@ -186,7 +186,7 @@
const GURL& url,
const GURL& referrer,
const string16& title,
- PageTransition::Type transition_type);
+ content::PageTransition transition_type);
~NavigationEntry();
// Page-related stuff --------------------------------------------------------
@@ -344,10 +344,10 @@
// The transition type indicates what the user did to move to this page from
// the previous page.
- void set_transition_type(PageTransition::Type transition_type) {
+ void set_transition_type(content::PageTransition transition_type) {
transition_type_ = transition_type;
}
- PageTransition::Type transition_type() const {
+ content::PageTransition transition_type() const {
return transition_type_;
}
@@ -422,7 +422,7 @@
std::string content_state_;
int32 page_id_;
SSLStatus ssl_;
- PageTransition::Type transition_type_;
+ content::PageTransition transition_type_;
GURL user_typed_url_;
bool has_post_data_;
RestoreType restore_type_;
« no previous file with comments | « content/browser/tab_contents/navigation_controller_unittest.cc ('k') | content/browser/tab_contents/navigation_entry.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698