summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ssl
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-02 07:45:20 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-02 07:45:20 +0000
commit299425b2fb4357b4a5952818842d9f6934307c74 (patch)
tree6426388ba6d2a7f7ebd3bb4d238d379ae86af257 /chrome/browser/ssl
parent11e5a22ee1868cbf3f8d1792913e31d00ecdeccc (diff)
downloadchromium_src-299425b2fb4357b4a5952818842d9f6934307c74.zip
chromium_src-299425b2fb4357b4a5952818842d9f6934307c74.tar.gz
chromium_src-299425b2fb4357b4a5952818842d9f6934307c74.tar.bz2
Update more includes that were pointing to the old locations.
TBR=avi Review URL: http://codereview.chromium.org/6598086 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76512 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ssl')
-rw-r--r--chrome/browser/ssl/ssl_blocking_page.h2
-rw-r--r--chrome/browser/ssl/ssl_browser_tests.cc6
-rw-r--r--chrome/browser/ssl/ssl_policy.cc2
-rw-r--r--chrome/browser/ssl/ssl_policy_backend.cc2
4 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/ssl/ssl_blocking_page.h b/chrome/browser/ssl/ssl_blocking_page.h
index 9b6584d..2e7847c 100644
--- a/chrome/browser/ssl/ssl_blocking_page.h
+++ b/chrome/browser/ssl/ssl_blocking_page.h
@@ -11,7 +11,7 @@
#include "base/string16.h"
#include "chrome/browser/ssl/ssl_error_info.h"
-#include "chrome/browser/tab_contents/interstitial_page.h"
+#include "content/browser/tab_contents/interstitial_page.h"
class DictionaryValue;
class SSLCertErrorHandler;
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index 1a8dded..d35d90a 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -4,15 +4,15 @@
#include "base/time.h"
#include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/tab_contents/interstitial_page.h"
-#include "chrome/browser/tab_contents/navigation_entry.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
#include "chrome/browser/tabs/tab_strip_model.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_navigator.h"
#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
#include "chrome/test/in_process_browser_test.h"
#include "chrome/test/ui_test_utils.h"
+#include "content/browser/tab_contents/interstitial_page.h"
+#include "content/browser/tab_contents/navigation_entry.h"
+#include "content/browser/tab_contents/tab_contents.h"
#include "net/base/cert_status_flags.h"
#include "net/test/test_server.h"
diff --git a/chrome/browser/ssl/ssl_policy.cc b/chrome/browser/ssl/ssl_policy.cc
index 853e402..b752352 100644
--- a/chrome/browser/ssl/ssl_policy.cc
+++ b/chrome/browser/ssl/ssl_policy.cc
@@ -12,13 +12,13 @@
#include "chrome/browser/ssl/ssl_cert_error_handler.h"
#include "chrome/browser/ssl/ssl_error_info.h"
#include "chrome/browser/ssl/ssl_request_info.h"
-#include "chrome/browser/tab_contents/navigation_entry.h"
#include "chrome/common/jstemplate_builder.h"
#include "chrome/common/time_format.h"
#include "chrome/common/url_constants.h"
#include "content/browser/renderer_host/render_process_host.h"
#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/site_instance.h"
+#include "content/browser/tab_contents/navigation_entry.h"
#include "content/browser/tab_contents/tab_contents.h"
#include "grit/generated_resources.h"
#include "net/base/cert_status_flags.h"
diff --git a/chrome/browser/ssl/ssl_policy_backend.cc b/chrome/browser/ssl/ssl_policy_backend.cc
index f193658..a545b85 100644
--- a/chrome/browser/ssl/ssl_policy_backend.cc
+++ b/chrome/browser/ssl/ssl_policy_backend.cc
@@ -6,7 +6,7 @@
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ssl/ssl_host_state.h"
-#include "chrome/browser/tab_contents/navigation_controller.h"
+#include "content/browser/tab_contents/navigation_controller.h"
SSLPolicyBackend::SSLPolicyBackend(NavigationController* controller)
: ssl_host_state_(controller->profile()->GetSSLHostState()) {