summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-26 23:37:58 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-26 23:37:58 +0000
commitf90a0fb4d44ae9d3fca4adf05b76f187c09840f6 (patch)
tree6ddbc895d39e9929123997f7806be31a0a79b0a2 /content
parent88fa6bf2a6300335381178004eb434df99595f04 (diff)
downloadchromium_src-f90a0fb4d44ae9d3fca4adf05b76f187c09840f6.zip
chromium_src-f90a0fb4d44ae9d3fca4adf05b76f187c09840f6.tar.gz
chromium_src-f90a0fb4d44ae9d3fca4adf05b76f187c09840f6.tar.bz2
Move security_style.h to content. It seems like useful information that an embedder would want.
Review URL: http://codereview.chromium.org/7062036 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@86928 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/browser/DEPS2
-rw-r--r--content/browser/tab_contents/navigation_entry.h2
-rw-r--r--content/common/security_style.h35
-rw-r--r--content/content_common.gypi1
4 files changed, 37 insertions, 3 deletions
diff --git a/content/browser/DEPS b/content/browser/DEPS
index 198e200..b7598bd 100644
--- a/content/browser/DEPS
+++ b/content/browser/DEPS
@@ -84,8 +84,6 @@ include_rules = [
"+chrome/common/sandbox_policy.h",
- "+chrome/common/security_style.h",
-
# ONLY USED BY TESTS
"+chrome/browser/net/url_request_failed_dns_job.h",
"+chrome/browser/net/url_request_mock_http_job.h",
diff --git a/content/browser/tab_contents/navigation_entry.h b/content/browser/tab_contents/navigation_entry.h
index 4c118b3..6cdce32 100644
--- a/content/browser/tab_contents/navigation_entry.h
+++ b/content/browser/tab_contents/navigation_entry.h
@@ -10,9 +10,9 @@
#include "base/basictypes.h"
#include "base/memory/ref_counted.h"
-#include "chrome/common/security_style.h"
#include "content/common/page_transition_types.h"
#include "content/common/page_type.h"
+#include "content/common/security_style.h"
#include "googleurl/src/gurl.h"
#include "third_party/skia/include/core/SkBitmap.h"
diff --git a/content/common/security_style.h b/content/common/security_style.h
new file mode 100644
index 0000000..4629325
--- /dev/null
+++ b/content/common/security_style.h
@@ -0,0 +1,35 @@
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CONTENT_COMMON_SECURITY_STYLE_H_
+#define CONTENT_COMMON_SECURITY_STYLE_H_
+#pragma once
+
+// Various aspects of the UI change their appearance according to the security
+// context in which they are displayed. For example, the location bar displays
+// a lock icon when it is displayed during a valid SSL connection.
+// SecuritySyle enumerates these styles, but it is up to the UI elements to
+// adjust their display appropriately.
+enum SecurityStyle {
+ // SECURITY_STYLE_UNKNOWN indicates that we do not know the proper security
+ // style for this object.
+ SECURITY_STYLE_UNKNOWN,
+
+ // SECURITY_STYLE_UNAUTHENTICATED means the authenticity of this object can
+ // not be determined, either because it was retrieved using an unauthenticated
+ // protocol, such as HTTP or FTP, or it was retrieved using a protocol that
+ // supports authentication, such as HTTPS, but there were errors during
+ // transmission that render us uncertain to the object's authenticity.
+ SECURITY_STYLE_UNAUTHENTICATED,
+
+ // SECURITY_STYLE_AUTHENTICATION_BROKEN indicates that we tried to retrieve
+ // this object in an authenticated manner but were unable to do so.
+ SECURITY_STYLE_AUTHENTICATION_BROKEN,
+
+ // SECURITY_STYLE_AUTHENTICATED indicates that we successfully retrieved this
+ // object over an authenticated protocol, such as HTTPS.
+ SECURITY_STYLE_AUTHENTICATED,
+};
+
+#endif // CONTENT_COMMON_SECURITY_STYLE_H_
diff --git a/content/content_common.gypi b/content/content_common.gypi
index 89d0b1d..ea57081 100644
--- a/content/content_common.gypi
+++ b/content/content_common.gypi
@@ -205,6 +205,7 @@
'common/sandbox_methods_linux.h',
'common/section_util_win.cc',
'common/section_util_win.h',
+ 'common/security_style.h',
'common/serialized_script_value.cc',
'common/serialized_script_value.h',
'common/set_process_title.cc',