diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-12 21:00:23 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-12 21:00:23 +0000 |
| commit | e24b70c4852ca81ac9719942d82bc753256904d7 (patch) | |
| tree | e2bff96244c560ba95bf0ef86e9bde71f7a5841f /chrome/browser/tab_contents | |
| parent | ef77dc138e27f5f143589a4c27ca760e0ac2d079 (diff) | |
| download | chromium_src-e24b70c4852ca81ac9719942d82bc753256904d7.zip chromium_src-e24b70c4852ca81ac9719942d82bc753256904d7.tar.gz chromium_src-e24b70c4852ca81ac9719942d82bc753256904d7.tar.bz2 | |
Reapply of Tony's r9656 (Add chrome/browser/ssl/ssl_manager.cc to the build.)
Also port 2 more files in browser/ssl to posix
* ssl_policy
* ssl_blocking_page
Review URL: http://codereview.chromium.org/21297
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9703 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents')
| -rw-r--r-- | chrome/browser/tab_contents/navigation_controller.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/chrome/browser/tab_contents/navigation_controller.h b/chrome/browser/tab_contents/navigation_controller.h index f39c595..d84e563 100644 --- a/chrome/browser/tab_contents/navigation_controller.h +++ b/chrome/browser/tab_contents/navigation_controller.h @@ -12,14 +12,13 @@ #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" |