content/browser/tab_contents/navigation_controller.h - Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated...

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/browser/tab_contents/navigation_controller.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_controller.h

===================================================================

--- content/browser/tab_contents/navigation_controller.h (revision 105162)

+++ content/browser/tab_contents/navigation_controller.h (working copy)

@@ -17,7 +17,7 @@

#include "content/browser/ssl/ssl_manager.h"

#include "content/common/content_export.h"

#include "content/common/navigation_types.h"

-#include "content/common/page_transition_types.h"

+#include "content/public/common/page_transition_types.h"

class NavigationEntry;

class SessionStorageNamespace;

@@ -177,7 +177,7 @@

// request. Extra headers are separated by \n.

void LoadURL(const GURL& url,

const GURL& referrer,

- PageTransition::Type type,

+ content::PageTransition type,

const std::string& extra_headers);

// Loads the current page if this NavigationController was restored from

@@ -330,7 +330,7 @@

static NavigationEntry* CreateNavigationEntry(

const GURL& url,

const GURL& referrer,

- PageTransition::Type transition,

+ content::PageTransition transition,

const std::string& extra_headers,

content::BrowserContext* browser_context);

« no previous file with comments | « content/browser/tab_contents/interstitial_page.cc ('k') | content/browser/tab_contents/navigation_controller.cc » ('j') | no next file with comments »