diff options
| author | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-05 18:33:15 +0000 |
|---|---|---|
| committer | pinkerton@chromium.org <pinkerton@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-05 18:33:15 +0000 |
| commit | faa138bef55364f6552c0c50dc3d1616a10201d0 (patch) | |
| tree | aa63338aab289aaf2c58ff48535513124245f4c8 /chrome/browser/tab_contents/navigation_controller.h | |
| parent | dbd9bfc0b4df5132997d1c4216ba4bbd860fed85 (diff) | |
| download | chromium_src-faa138bef55364f6552c0c50dc3d1616a10201d0.zip chromium_src-faa138bef55364f6552c0c50dc3d1616a10201d0.tar.gz chromium_src-faa138bef55364f6552c0c50dc3d1616a10201d0.tar.bz2 | |
Add in NavigationController to linux and mac.
Review URL: http://codereview.chromium.org/21064
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9226 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents/navigation_controller.h')
| -rw-r--r-- | chrome/browser/tab_contents/navigation_controller.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/chrome/browser/tab_contents/navigation_controller.h b/chrome/browser/tab_contents/navigation_controller.h index 2a6dea5..f39c595 100644 --- a/chrome/browser/tab_contents/navigation_controller.h +++ b/chrome/browser/tab_contents/navigation_controller.h @@ -7,14 +7,24 @@ #include <map> +#include "build/build_config.h" + +#if defined(OS_POSIX) +// TODO(port): remove when dependent classes are ported +#include "chrome/common/temp_scaffolding_stubs.h" +#elif defined(OS_WIN) +#include "chrome/browser/ssl/ssl_manager.h" +#endif + #include "base/linked_ptr.h" #include "base/ref_counted.h" +#include "googleurl/src/gurl.h" #include "chrome/browser/sessions/session_id.h" -#include "chrome/browser/ssl/ssl_manager.h" #include "chrome/browser/tab_contents/tab_contents_type.h" #include "chrome/common/navigation_types.h" #include "chrome/common/page_transition_types.h" +class NavigationEntry; class GURL; class Profile; class TabContents; @@ -509,8 +519,8 @@ class NavigationController { // A map of TabContentsType -> TabContentsCollector containing all the // pending collectors. - typedef base::hash_map<TabContentsType, TabContentsCollector*> - TabContentsCollectorMap; + typedef std::map<TabContentsType, TabContentsCollector*> + TabContentsCollectorMap; TabContentsCollectorMap tab_contents_collector_map_; // The tab contents that is currently active. |