diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 16:35:08 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-18 16:35:08 +0000 |
| commit | 610cbb8cd46f9fdfa36d8935d5048d92445ae102 (patch) | |
| tree | e4073d1addceb33cac8ab8e0824fbde9279d3d7a /chrome/browser/instant | |
| parent | d8865c2179a327f85e7be4e6d8925f559269043a (diff) | |
| download | chromium_src-610cbb8cd46f9fdfa36d8935d5048d92445ae102.zip chromium_src-610cbb8cd46f9fdfa36d8935d5048d92445ae102.tar.gz chromium_src-610cbb8cd46f9fdfa36d8935d5048d92445ae102.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
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=106029
Review URL: http://codereview.chromium.org/8339006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106070 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/instant')
| -rw-r--r-- | chrome/browser/instant/instant_loader.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/instant/instant_loader.cc b/chrome/browser/instant/instant_loader.cc index 3a00147..af74814 100644 --- a/chrome/browser/instant/instant_loader.cc +++ b/chrome/browser/instant/instant_loader.cc @@ -221,7 +221,7 @@ class InstantLoader::TabContentsDelegateImpl virtual bool OnGoToEntryOffset(int offset) OVERRIDE; virtual bool ShouldAddNavigationToHistory( const history::HistoryAddPageArgs& add_page_args, - NavigationType::Type navigation_type) OVERRIDE; + content::NavigationType navigation_type) OVERRIDE; // TabContentsWrapperDelegate: virtual void SwapTabContents(TabContentsWrapper* old_tc, @@ -490,9 +490,11 @@ bool InstantLoader::TabContentsDelegateImpl::OnGoToEntryOffset(int offset) { bool InstantLoader::TabContentsDelegateImpl::ShouldAddNavigationToHistory( const history::HistoryAddPageArgs& add_page_args, - NavigationType::Type navigation_type) { - if (waiting_for_new_page_ && navigation_type == NavigationType::NEW_PAGE) + content::NavigationType navigation_type) { + if (waiting_for_new_page_ && + navigation_type == content::NAVIGATION_TYPE_NEW_PAGE) { waiting_for_new_page_ = false; + } if (!waiting_for_new_page_) { add_page_vector_.push_back( |