diff options
19 files changed, 68 insertions, 54 deletions
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index f0a8bdf..51ae96e 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -1540,7 +1540,7 @@ void TestingAutomationProvider::WaitForTabToBeRestored( void TestingAutomationProvider::GetSecurityState( int handle, bool* success, - SecurityStyle* security_style, + content::SecurityStyle* security_style, net::CertStatus* ssl_cert_status, int* insecure_content_status) { if (tab_tracker_->ContainsHandle(handle)) { @@ -1552,7 +1552,7 @@ void TestingAutomationProvider::GetSecurityState( *insecure_content_status = entry->ssl().content_status(); } else { *success = false; - *security_style = SECURITY_STYLE_UNKNOWN; + *security_style = content::SECURITY_STYLE_UNKNOWN; *ssl_cert_status = 0; *insecure_content_status = 0; } @@ -2981,13 +2981,13 @@ void TestingAutomationProvider::GetNavigationInfo( // Security info. DictionaryValue* ssl = new DictionaryValue; - std::map<SecurityStyle, std::string> style_to_string; - style_to_string[SECURITY_STYLE_UNKNOWN] = "SECURITY_STYLE_UNKNOWN"; - style_to_string[SECURITY_STYLE_UNAUTHENTICATED] = + std::map<content::SecurityStyle, std::string> style_to_string; + style_to_string[content::SECURITY_STYLE_UNKNOWN] = "SECURITY_STYLE_UNKNOWN"; + style_to_string[content::SECURITY_STYLE_UNAUTHENTICATED] = "SECURITY_STYLE_UNAUTHENTICATED"; - style_to_string[SECURITY_STYLE_AUTHENTICATION_BROKEN] = + style_to_string[content::SECURITY_STYLE_AUTHENTICATION_BROKEN] = "SECURITY_STYLE_AUTHENTICATION_BROKEN"; - style_to_string[SECURITY_STYLE_AUTHENTICATED] = + style_to_string[content::SECURITY_STYLE_AUTHENTICATED] = "SECURITY_STYLE_AUTHENTICATED"; NavigationEntry::SSLStatus ssl_status = nav_entry->ssl(); diff --git a/chrome/browser/automation/testing_automation_provider.h b/chrome/browser/automation/testing_automation_provider.h index 9c8877b..fbbc597 100644 --- a/chrome/browser/automation/testing_automation_provider.h +++ b/chrome/browser/automation/testing_automation_provider.h @@ -203,7 +203,7 @@ class TestingAutomationProvider : public AutomationProvider, // Gets the security state for the tab associated to the specified |handle|. void GetSecurityState(int handle, bool* success, - SecurityStyle* security_style, + content::SecurityStyle* security_style, net::CertStatus* ssl_cert_status, int* insecure_content_status); diff --git a/chrome/browser/page_info_model.cc b/chrome/browser/page_info_model.cc index d979a22..1054449 100644 --- a/chrome/browser/page_info_model.cc +++ b/chrome/browser/page_info_model.cc @@ -140,7 +140,7 @@ PageInfoModel::PageInfoModel(Profile* profile, // HTTP or HTTPS with errors (not warnings). description.assign(l10n_util::GetStringUTF16( IDS_PAGE_INFO_SECURITY_TAB_INSECURE_IDENTITY)); - icon_id = ssl.security_style() == SECURITY_STYLE_UNAUTHENTICATED ? + icon_id = ssl.security_style() == content::SECURITY_STYLE_UNAUTHENTICATED ? ICON_STATE_WARNING_MAJOR : ICON_STATE_ERROR; const string16 bullet = UTF8ToUTF16("\n • "); @@ -173,8 +173,8 @@ PageInfoModel::PageInfoModel(Profile* profile, description.clear(); if (!ssl.cert_id()) { // Not HTTPS. - DCHECK_EQ(ssl.security_style(), SECURITY_STYLE_UNAUTHENTICATED); - icon_id = ssl.security_style() == SECURITY_STYLE_UNAUTHENTICATED ? + DCHECK_EQ(ssl.security_style(), content::SECURITY_STYLE_UNAUTHENTICATED); + icon_id = ssl.security_style() == content::SECURITY_STYLE_UNAUTHENTICATED ? ICON_STATE_WARNING_MAJOR : ICON_STATE_ERROR; description.assign(l10n_util::GetStringFUTF16( IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT, @@ -183,7 +183,7 @@ PageInfoModel::PageInfoModel(Profile* profile, // Security strength is unknown. Say nothing. icon_id = ICON_STATE_ERROR; } else if (ssl.security_bits() == 0) { - DCHECK_NE(ssl.security_style(), SECURITY_STYLE_UNAUTHENTICATED); + DCHECK_NE(ssl.security_style(), content::SECURITY_STYLE_UNAUTHENTICATED); icon_id = ICON_STATE_ERROR; description.assign(l10n_util::GetStringFUTF16( IDS_PAGE_INFO_SECURITY_TAB_NOT_ENCRYPTED_CONNECTION_TEXT, diff --git a/chrome/browser/ssl/ssl_blocking_page.cc b/chrome/browser/ssl/ssl_blocking_page.cc index abe4a585..1fb85f86 100644 --- a/chrome/browser/ssl/ssl_blocking_page.cc +++ b/chrome/browser/ssl/ssl_blocking_page.cc @@ -111,7 +111,8 @@ void SSLBlockingPage::UpdateEntry(NavigationEntry* entry) { int cert_id = CertStore::GetInstance()->StoreCert( ssl_info.cert, tab()->render_view_host()->process()->id()); - entry->ssl().set_security_style(SECURITY_STYLE_AUTHENTICATION_BROKEN); + entry->ssl().set_security_style( + content::SECURITY_STYLE_AUTHENTICATION_BROKEN); entry->ssl().set_cert_id(cert_id); entry->ssl().set_cert_status(ssl_info.cert_status); entry->ssl().set_security_bits(ssl_info.security_bits); diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc index a210105..562f58f 100644 --- a/chrome/browser/ssl/ssl_browser_tests.cc +++ b/chrome/browser/ssl/ssl_browser_tests.cc @@ -49,7 +49,8 @@ class SSLUITest : public InProcessBrowserTest { NavigationEntry* entry = tab->controller().GetActiveEntry(); ASSERT_TRUE(entry); EXPECT_EQ(content::PAGE_TYPE_NORMAL, entry->page_type()); - EXPECT_EQ(SECURITY_STYLE_AUTHENTICATED, entry->ssl().security_style()); + EXPECT_EQ(content::SECURITY_STYLE_AUTHENTICATED, + entry->ssl().security_style()); EXPECT_EQ(0U, entry->ssl().cert_status() & net::CERT_STATUS_ALL_ERRORS); EXPECT_EQ(displayed_insecure_content, entry->ssl().displayed_insecure_content()); @@ -60,7 +61,8 @@ class SSLUITest : public InProcessBrowserTest { NavigationEntry* entry = tab->controller().GetActiveEntry(); ASSERT_TRUE(entry); EXPECT_EQ(content::PAGE_TYPE_NORMAL, entry->page_type()); - EXPECT_EQ(SECURITY_STYLE_UNAUTHENTICATED, entry->ssl().security_style()); + EXPECT_EQ(content::SECURITY_STYLE_UNAUTHENTICATED, + entry->ssl().security_style()); EXPECT_EQ(0U, entry->ssl().cert_status() & net::CERT_STATUS_ALL_ERRORS); EXPECT_FALSE(entry->ssl().displayed_insecure_content()); EXPECT_FALSE(entry->ssl().ran_insecure_content()); @@ -75,7 +77,7 @@ class SSLUITest : public InProcessBrowserTest { EXPECT_EQ(interstitial ? content::PAGE_TYPE_INTERSTITIAL : content::PAGE_TYPE_NORMAL, entry->page_type()); - EXPECT_EQ(SECURITY_STYLE_AUTHENTICATION_BROKEN, + EXPECT_EQ(content::SECURITY_STYLE_AUTHENTICATION_BROKEN, entry->ssl().security_style()); // CERT_STATUS_UNABLE_TO_CHECK_REVOCATION doesn't lower the security style // to SECURITY_STYLE_AUTHENTICATION_BROKEN. diff --git a/chrome/browser/ui/toolbar/toolbar_model.cc b/chrome/browser/ui/toolbar/toolbar_model.cc index eeefbec..d5583dd 100644 --- a/chrome/browser/ui/toolbar/toolbar_model.cc +++ b/chrome/browser/ui/toolbar/toolbar_model.cc @@ -75,7 +75,7 @@ bool ToolbarModel::ShouldDisplayURL() const { if (entry->IsViewSourceMode() || entry->page_type() == content::PAGE_TYPE_INTERSTITIAL) { return true; - } + } } TabContents* tab_contents = browser_->GetSelectedTabContents(); @@ -102,14 +102,14 @@ ToolbarModel::SecurityLevel ToolbarModel::GetSecurityLevel() const { const NavigationEntry::SSLStatus& ssl = entry->ssl(); switch (ssl.security_style()) { - case SECURITY_STYLE_UNKNOWN: - case SECURITY_STYLE_UNAUTHENTICATED: + case content::SECURITY_STYLE_UNKNOWN: + case content::SECURITY_STYLE_UNAUTHENTICATED: return NONE; - case SECURITY_STYLE_AUTHENTICATION_BROKEN: + case content::SECURITY_STYLE_AUTHENTICATION_BROKEN: return SECURITY_ERROR; - case SECURITY_STYLE_AUTHENTICATED: + case content::SECURITY_STYLE_AUTHENTICATED: if (ssl.displayed_insecure_content()) return SECURITY_WARNING; if (net::IsCertStatusError(ssl.cert_status())) { diff --git a/chrome/common/automation_messages.cc b/chrome/common/automation_messages.cc index b6deaa1..f14c6f63 100644 --- a/chrome/common/automation_messages.cc +++ b/chrome/common/automation_messages.cc @@ -97,7 +97,7 @@ NavigationInfo::NavigationInfo() : navigation_type(0), relative_offset(0), navigation_index(0), - security_style(SECURITY_STYLE_UNKNOWN), + security_style(content::SECURITY_STYLE_UNKNOWN), displayed_insecure_content(0), ran_insecure_content(0) { } @@ -108,7 +108,7 @@ NavigationInfo::NavigationInfo(int in_navigation_type, const std::wstring& in_title, const GURL& in_url, const GURL& in_referrer, - SecurityStyle in_security_style, + content::SecurityStyle in_security_style, bool in_displayed_insecure_content, bool in_ran_insecure_content) : navigation_type(in_navigation_type), diff --git a/chrome/common/automation_messages.h b/chrome/common/automation_messages.h index bb156c4..590eb6f 100644 --- a/chrome/common/automation_messages.h +++ b/chrome/common/automation_messages.h @@ -11,9 +11,9 @@ #include "chrome/common/automation_constants.h" #include "chrome/common/content_settings.h" #include "content/common/common_param_traits.h" -#include "content/common/security_style.h" #include "content/common/webkit_param_traits.h" #include "content/public/common/page_type.h" +#include "content/public/common/security_style.h" #include "ipc/ipc_message_macros.h" #include "ipc/ipc_message_utils.h" #include "net/base/host_port_pair.h" @@ -95,7 +95,7 @@ struct NavigationInfo { const std::wstring& title, const GURL& url, const GURL& referrer, - SecurityStyle security_style, + content::SecurityStyle security_style, bool displayed_insecure_content, bool ran_insecure_content); ~NavigationInfo(); @@ -106,7 +106,7 @@ struct NavigationInfo { std::wstring title; GURL url; GURL referrer; - SecurityStyle security_style; + content::SecurityStyle security_style; bool displayed_insecure_content; bool ran_insecure_content; }; @@ -266,7 +266,7 @@ struct SimilarTypeTraits<AutomationMsg_ExtensionProperty> { }; template <> -struct SimilarTypeTraits<SecurityStyle> { +struct SimilarTypeTraits<content::SecurityStyle> { typedef int Type; }; diff --git a/chrome/common/automation_messages_internal.h b/chrome/common/automation_messages_internal.h index 31299a8..b4ceb1d 100644 --- a/chrome/common/automation_messages_internal.h +++ b/chrome/common/automation_messages_internal.h @@ -559,7 +559,7 @@ IPC_MESSAGE_ROUTED1(AutomationMsg_DidNavigate, IPC_SYNC_MESSAGE_CONTROL1_4(AutomationMsg_GetSecurityState, int, bool, - SecurityStyle, + content::SecurityStyle, net::CertStatus, int) diff --git a/chrome/common/chrome_content_client.cc b/chrome/common/chrome_content_client.cc index 127e1df..877f9be 100644 --- a/chrome/common/chrome_content_client.cc +++ b/chrome/common/chrome_content_client.cc @@ -26,7 +26,6 @@ #include "webkit/plugins/plugin_constants.h" #if defined(OS_WIN) -#include "content/common/sandbox_policy.h" #include "sandbox/src/sandbox.h" #endif diff --git a/chrome/test/automation/tab_proxy.cc b/chrome/test/automation/tab_proxy.cc index 466ee68..a5d70a0 100644 --- a/chrome/test/automation/tab_proxy.cc +++ b/chrome/test/automation/tab_proxy.cc @@ -570,7 +570,7 @@ bool TabProxy::WaitForTabToBeRestored(uint32 timeout_ms) { succeeded; } -bool TabProxy::GetSecurityState(SecurityStyle* security_style, +bool TabProxy::GetSecurityState(content::SecurityStyle* security_style, net::CertStatus* ssl_cert_status, int* insecure_content_status) { DCHECK(security_style && ssl_cert_status && insecure_content_status); diff --git a/chrome/test/automation/tab_proxy.h b/chrome/test/automation/tab_proxy.h index b260c92..c38b57c3 100644 --- a/chrome/test/automation/tab_proxy.h +++ b/chrome/test/automation/tab_proxy.h @@ -23,8 +23,8 @@ #include "chrome/test/automation/dom_element_proxy.h" #include "chrome/test/automation/javascript_execution_controller.h" #include "content/browser/download/save_package.h" -#include "content/common/security_style.h" #include "content/public/common/page_type.h" +#include "content/public/common/security_style.h" #include "webkit/glue/window_open_disposition.h" class BrowserProxy; @@ -281,7 +281,7 @@ class TabProxy : public AutomationResourceProxy, bool WaitForTabToBeRestored(uint32 timeout_ms) WARN_UNUSED_RESULT; // Retrieves the different security states for the current tab. - bool GetSecurityState(SecurityStyle* security_style, + bool GetSecurityState(content::SecurityStyle* security_style, net::CertStatus* ssl_cert_status, int* insecure_content_status) WARN_UNUSED_RESULT; diff --git a/chrome_frame/chrome_active_document.cc b/chrome_frame/chrome_active_document.cc index b1fdc25..cf903e9 100644 --- a/chrome_frame/chrome_active_document.cc +++ b/chrome_frame/chrome_active_document.cc @@ -703,7 +703,7 @@ void ChromeActiveDocument::UpdateNavigationState( if (is_ssl_state_changed) { int lock_status = SECURELOCK_SET_UNSECURE; switch (new_navigation_info.security_style) { - case SECURITY_STYLE_AUTHENTICATED: + case content::SECURITY_STYLE_AUTHENTICATED: lock_status = new_navigation_info.displayed_insecure_content ? SECURELOCK_SET_MIXED : SECURELOCK_SET_SECUREUNKNOWNBIT; break; diff --git a/content/browser/ssl/ssl_policy.cc b/content/browser/ssl/ssl_policy.cc index 102ba7d..3b17d950 100644 --- a/content/browser/ssl/ssl_policy.cc +++ b/content/browser/ssl/ssl_policy.cc @@ -117,7 +117,7 @@ void SSLPolicy::UpdateEntry(NavigationEntry* entry, TabContents* tab_contents) { // happens, use the unauthenticated (HTTP) rather than the authentication // broken security style so that we can detect this error condition. if (!entry->ssl().cert_id()) { - entry->ssl().set_security_style(SECURITY_STYLE_UNAUTHENTICATED); + entry->ssl().set_security_style(content::SECURITY_STYLE_UNAUTHENTICATED); return; } @@ -133,8 +133,10 @@ void SSLPolicy::UpdateEntry(NavigationEntry* entry, TabContents* tab_contents) { if (net::IsCertStatusError(entry->ssl().cert_status())) { // Minor errors don't lower the security style to // SECURITY_STYLE_AUTHENTICATION_BROKEN. - if (!net::IsCertStatusMinorError(entry->ssl().cert_status())) - entry->ssl().set_security_style(SECURITY_STYLE_AUTHENTICATION_BROKEN); + if (!net::IsCertStatusMinorError(entry->ssl().cert_status())) { + entry->ssl().set_security_style( + content::SECURITY_STYLE_AUTHENTICATION_BROKEN); + } return; } @@ -145,7 +147,8 @@ void SSLPolicy::UpdateEntry(NavigationEntry* entry, TabContents* tab_contents) { if (site_instance && backend_->DidHostRunInsecureContent(entry->url().host(), site_instance->GetProcess()->id())) { - entry->ssl().set_security_style(SECURITY_STYLE_AUTHENTICATION_BROKEN); + entry->ssl().set_security_style( + content::SECURITY_STYLE_AUTHENTICATION_BROKEN); entry->ssl().set_ran_insecure_content(); return; } @@ -202,11 +205,12 @@ void SSLPolicy::OnCertErrorInternal(SSLCertErrorHandler* handler, } void SSLPolicy::InitializeEntryIfNeeded(NavigationEntry* entry) { - if (entry->ssl().security_style() != SECURITY_STYLE_UNKNOWN) + if (entry->ssl().security_style() != content::SECURITY_STYLE_UNKNOWN) return; entry->ssl().set_security_style(entry->url().SchemeIsSecure() ? - SECURITY_STYLE_AUTHENTICATED : SECURITY_STYLE_UNAUTHENTICATED); + content::SECURITY_STYLE_AUTHENTICATED : + content::SECURITY_STYLE_UNAUTHENTICATED); } void SSLPolicy::OriginRanInsecureContent(const std::string& origin, int pid) { diff --git a/content/browser/tab_contents/navigation_entry.cc b/content/browser/tab_contents/navigation_entry.cc index 0773f56..3e60a53b 100644 --- a/content/browser/tab_contents/navigation_entry.cc +++ b/content/browser/tab_contents/navigation_entry.cc @@ -21,7 +21,7 @@ static int GetUniqueID() { } NavigationEntry::SSLStatus::SSLStatus() - : security_style_(SECURITY_STYLE_UNKNOWN), + : security_style_(content::SECURITY_STYLE_UNKNOWN), cert_id_(0), cert_status_(0), security_bits_(-1), diff --git a/content/browser/tab_contents/navigation_entry.h b/content/browser/tab_contents/navigation_entry.h index 6c4c2fa..5f729c5 100644 --- a/content/browser/tab_contents/navigation_entry.h +++ b/content/browser/tab_contents/navigation_entry.h @@ -11,9 +11,9 @@ #include "base/basictypes.h" #include "base/memory/ref_counted.h" #include "content/common/content_export.h" -#include "content/common/security_style.h" #include "content/public/common/page_transition_types.h" #include "content/public/common/page_type.h" +#include "content/public/common/security_style.h" #include "googleurl/src/gurl.h" #include "net/base/cert_status_flags.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -62,10 +62,10 @@ class CONTENT_EXPORT NavigationEntry { content_status_ == status.content_status_; } - void set_security_style(SecurityStyle security_style) { + void set_security_style(content::SecurityStyle security_style) { security_style_ = security_style; } - SecurityStyle security_style() const { + content::SecurityStyle security_style() const { return security_style_; } @@ -124,7 +124,7 @@ class CONTENT_EXPORT NavigationEntry { private: // See the accessors above for descriptions. - SecurityStyle security_style_; + content::SecurityStyle security_style_; int cert_id_; net::CertStatus cert_status_; int security_bits_; diff --git a/content/browser/tab_contents/navigation_entry_unittest.cc b/content/browser/tab_contents/navigation_entry_unittest.cc index 797d2c1..2dbece97 100644 --- a/content/browser/tab_contents/navigation_entry_unittest.cc +++ b/content/browser/tab_contents/navigation_entry_unittest.cc @@ -103,8 +103,10 @@ TEST_F(NavigationEntryTest, NavigationEntryFavicons) { // Test SSLStatus inner class TEST_F(NavigationEntryTest, NavigationEntrySSLStatus) { // Default (unknown) - EXPECT_EQ(SECURITY_STYLE_UNKNOWN, entry1_.get()->ssl().security_style()); - EXPECT_EQ(SECURITY_STYLE_UNKNOWN, entry2_.get()->ssl().security_style()); + EXPECT_EQ(content::SECURITY_STYLE_UNKNOWN, + entry1_.get()->ssl().security_style()); + EXPECT_EQ(content::SECURITY_STYLE_UNKNOWN, + entry2_.get()->ssl().security_style()); EXPECT_EQ(0, entry1_.get()->ssl().cert_id()); EXPECT_EQ(0U, entry1_.get()->ssl().cert_status()); EXPECT_EQ(-1, entry1_.get()->ssl().security_bits()); @@ -112,12 +114,13 @@ TEST_F(NavigationEntryTest, NavigationEntrySSLStatus) { EXPECT_FALSE(entry1_.get()->ssl().ran_insecure_content()); // Change from the defaults - entry2_.get()->ssl().set_security_style(SECURITY_STYLE_AUTHENTICATED); + entry2_.get()->ssl().set_security_style( + content::SECURITY_STYLE_AUTHENTICATED); entry2_.get()->ssl().set_cert_id(4); entry2_.get()->ssl().set_cert_status(net::CERT_STATUS_COMMON_NAME_INVALID); entry2_.get()->ssl().set_security_bits(0); entry2_.get()->ssl().set_displayed_insecure_content(); - EXPECT_EQ(SECURITY_STYLE_AUTHENTICATED, + EXPECT_EQ(content::SECURITY_STYLE_AUTHENTICATED, entry2_.get()->ssl().security_style()); EXPECT_EQ(4, entry2_.get()->ssl().cert_id()); EXPECT_EQ(net::CERT_STATUS_COMMON_NAME_INVALID, @@ -125,9 +128,10 @@ TEST_F(NavigationEntryTest, NavigationEntrySSLStatus) { EXPECT_EQ(0, entry2_.get()->ssl().security_bits()); EXPECT_TRUE(entry2_.get()->ssl().displayed_insecure_content()); - entry2_.get()->ssl().set_security_style(SECURITY_STYLE_AUTHENTICATION_BROKEN); + entry2_.get()->ssl().set_security_style( + content::SECURITY_STYLE_AUTHENTICATION_BROKEN); entry2_.get()->ssl().set_ran_insecure_content(); - EXPECT_EQ(SECURITY_STYLE_AUTHENTICATION_BROKEN, + EXPECT_EQ(content::SECURITY_STYLE_AUTHENTICATION_BROKEN, entry2_.get()->ssl().security_style()); EXPECT_TRUE(entry2_.get()->ssl().ran_insecure_content()); } diff --git a/content/content_common.gypi b/content/content_common.gypi index a986170..10e29f59 100644 --- a/content/content_common.gypi +++ b/content/content_common.gypi @@ -40,6 +40,7 @@ 'public/common/page_transition_types.h', 'public/common/page_type.h', 'public/common/resource_dispatcher_delegate.h', + 'public/common/security_style.h', 'public/common/url_constants.cc', 'public/common/url_constants.h', 'public/common/view_types.h', @@ -211,7 +212,6 @@ 'common/sandbox_policy.h', 'common/section_util_win.cc', 'common/section_util_win.h', - 'common/security_style.h', 'common/sensors.h', 'common/sensors_listener.h', 'common/serialized_script_value.cc', diff --git a/content/common/security_style.h b/content/public/common/security_style.h index 4629325..98e6c21 100644 --- a/content/common/security_style.h +++ b/content/public/common/security_style.h @@ -2,10 +2,12 @@ // 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_ +#ifndef CONTENT_PUBLIC_COMMON_SECURITY_STYLE_H_ +#define CONTENT_PUBLIC_COMMON_SECURITY_STYLE_H_ #pragma once +namespace content { + // 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. @@ -32,4 +34,6 @@ enum SecurityStyle { SECURITY_STYLE_AUTHENTICATED, }; -#endif // CONTENT_COMMON_SECURITY_STYLE_H_ +} // namespace content + +#endif // CONTENT_PUBLIC_COMMON_SECURITY_STYLE_H_ |