chrome/browser/tab_contents/navigation_entry.h - Issue 4194007: Revert "Refactor automation messages." due to mysterious problems on mac.

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: chrome/browser/tab_contents/navigation_entry.h

Issue 4194007: Revert "Refactor automation messages." due to mysterious problems on mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 10 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 | « chrome/browser/tab_contents/navigation_controller_unittest.cc ('k') | chrome/browser/tab_contents/navigation_entry_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/tab_contents/navigation_entry.h

diff --git a/chrome/browser/tab_contents/navigation_entry.h b/chrome/browser/tab_contents/navigation_entry.h

index ca97e0256d31cca6e9e399caff90f0439fcd3f18..9a5f6a5d60009be07711aa1457b3933d8a6b9c58 100644

--- a/chrome/browser/tab_contents/navigation_entry.h

+++ b/chrome/browser/tab_contents/navigation_entry.h

@@ -10,9 +10,8 @@

#include "base/basictypes.h"

#include "base/ref_counted.h"

-#include "chrome/common/page_type.h"

+#include "chrome/browser/tab_contents/security_style.h"

#include "chrome/common/page_transition_types.h"

-#include "chrome/common/security_style.h"

#include "googleurl/src/gurl.h"

#include "third_party/skia/include/core/SkBitmap.h"

@@ -133,6 +132,13 @@ class NavigationEntry {

// Copy and assignment is explicitly allowed for this class.

};

+ // The type of the page an entry corresponds to. Used by tests.

+ enum PageType {

+ NORMAL_PAGE = 0,

+ ERROR_PAGE,

+ INTERSTITIAL_PAGE

+ };

// Favicon -------------------------------------------------------------------

// Collects the favicon related information for a NavigationEntry.