diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-06 00:38:46 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-06 00:38:46 +0000 |
| commit | d908348c6529cb0ac528eec52d6f8c3ca30d0b33 (patch) | |
| tree | a1e70726ad1191ea8fb6b0010a02ef89cdc5101d /chrome_frame | |
| parent | 38af455b42c098bab243b4a71895e1b07809256d (diff) | |
| download | chromium_src-d908348c6529cb0ac528eec52d6f8c3ca30d0b33.zip chromium_src-d908348c6529cb0ac528eec52d6f8c3ca30d0b33.tar.gz chromium_src-d908348c6529cb0ac528eec52d6f8c3ca30d0b33.tar.bz2 | |
Get rid of TabContentsWrapper::tab_contents. Also make it use WebContents exclusively. This allows updating all the creaters of TCW to not include tab_contents.h as well, and use WebContents::Create instead.
BUG=98716
Review URL: http://codereview.chromium.org/9108025
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116600 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_active_document.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc index 8e84714..d61ae7b 100644 --- a/chrome_frame/chrome_active_document.cc +++ b/chrome_frame/chrome_active_document.cc @@ -35,6 +35,7 @@ #include "chrome_frame/crash_reporting/crash_metrics.h" #include "chrome_frame/utils.h" #include "content/browser/tab_contents/tab_contents.h" +#include "content/public/browser/invalidate_type.h" #include "content/public/common/page_zoom.h" #include "grit/generated_resources.h" @@ -599,7 +600,7 @@ HRESULT ChromeActiveDocument::ActiveXDocActivate(LONG verb) { void ChromeActiveDocument::OnNavigationStateChanged( int flags, const NavigationInfo& nav_info) { - // TODO(joshia): handle INVALIDATE_TAB,INVALIDATE_LOAD etc. + // TODO(joshia): handle INVALIDATE_TYPE_TAB,INVALIDATE_TYPE_LOAD etc. DVLOG(1) << __FUNCTION__ << "\n Flags: " << flags << ", Url: " << nav_info.url @@ -1384,13 +1385,13 @@ bool ChromeActiveDocument::IsNewNavigation( // the renderer(WebKit). Condition 1 below has to be true along with the // any of the other conditions below. // 1. The navigation notification flags passed in as the flags parameter - // is not INVALIDATE_LOAD which indicates that the loading state of the - // tab changed. + // is not INVALIDATE_TYPE_LOAD which indicates that the loading state of + // the tab changed. // 2. The navigation index is greater than 0 which means that a top level // navigation was initiated on the current external tab. // 3. The navigation type has changed. // 4. The url or the referrer are different. - if (flags == TabContents::INVALIDATE_LOAD) + if (flags == content::INVALIDATE_TYPE_LOAD) return false; if (new_navigation_info.navigation_index <= 0) |