diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 04:37:24 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 04:37:24 +0000 |
| commit | 64fbfe318caa5ed948b4fc76d20faab443510761 (patch) | |
| tree | e3ef9c520f12f777b227ed4debee8f62144b96a6 /content/browser/tab_contents/navigation_controller.h | |
| parent | 0d6e9bd0a2788f03f07f4b90a222fe06270b79b5 (diff) | |
| download | chromium_src-64fbfe318caa5ed948b4fc76d20faab443510761.zip chromium_src-64fbfe318caa5ed948b4fc76d20faab443510761.tar.gz chromium_src-64fbfe318caa5ed948b4fc76d20faab443510761.tar.bz2 | |
Move navigation_types.h from content/common to content/public/browser, and put it in the content namespace. There was no reason for it to be in common since it's only used by browser. I also updated the enum names to match the rest of the enums in the Content API.
BUG=98716
TBR=joi
Review URL: http://codereview.chromium.org/8339006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106029 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/tab_contents/navigation_controller.h')
| -rw-r--r-- | content/browser/tab_contents/navigation_controller.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/browser/tab_contents/navigation_controller.h b/content/browser/tab_contents/navigation_controller.h index 7127057..e9bc0d3 100644 --- a/content/browser/tab_contents/navigation_controller.h +++ b/content/browser/tab_contents/navigation_controller.h @@ -16,7 +16,7 @@ #include "googleurl/src/gurl.h" #include "content/browser/ssl/ssl_manager.h" #include "content/common/content_export.h" -#include "content/common/navigation_types.h" +#include "content/public/browser/navigation_types.h" #include "content/public/common/page_transition_types.h" class NavigationEntry; @@ -348,7 +348,7 @@ class CONTENT_EXPORT NavigationController { friend class TabContents; // For invoking OnReservedPageIDRange. // Classifies the given renderer navigation (see the NavigationType enum). - NavigationType::Type ClassifyNavigation( + content::NavigationType ClassifyNavigation( const ViewHostMsg_FrameNavigate_Params& params) const; // Causes the controller to load the specified entry. The function assumes |