summaryrefslogtreecommitdiffstats
path: root/content/browser
diff options
context:
space:
mode:
Diffstat (limited to 'content/browser')
-rw-r--r--content/browser/debugger/devtools_http_handler_impl.cc3
-rw-r--r--content/browser/download/save_package.cc1
-rw-r--r--content/browser/renderer_host/test_render_view_host.cc1
-rw-r--r--content/browser/ssl/ssl_manager.cc20
-rw-r--r--content/browser/ssl/ssl_policy.cc34
-rw-r--r--content/browser/tab_contents/navigation_entry.cc35
-rw-r--r--content/browser/tab_contents/navigation_entry.h177
-rw-r--r--content/browser/tab_contents/navigation_entry_unittest.cc52
-rw-r--r--content/browser/tab_contents/tab_contents.cc3
-rw-r--r--content/browser/tab_contents/tab_contents.h2
-rw-r--r--content/browser/tab_contents/test_tab_contents.cc1
-rw-r--r--content/browser/tab_contents/web_drag_source_gtk.cc1
12 files changed, 83 insertions, 247 deletions
diff --git a/content/browser/debugger/devtools_http_handler_impl.cc b/content/browser/debugger/devtools_http_handler_impl.cc
index 73a9e67..af6518d 100644
--- a/content/browser/debugger/devtools_http_handler_impl.cc
+++ b/content/browser/debugger/devtools_http_handler_impl.cc
@@ -17,6 +17,7 @@
#include "base/threading/thread.h"
#include "base/utf_string_conversions.h"
#include "base/values.h"
+#include "content/browser/tab_contents/navigation_entry.h"
#include "content/browser/tab_contents/tab_contents.h"
#include "content/common/devtools_messages.h"
#include "content/public/browser/browser_thread.h"
@@ -297,7 +298,7 @@ static PageList GeneratePageList(
page_info.url = entry->GetURL().spec();
page_info.title = UTF16ToUTF8(net::EscapeForHTML(entry->GetTitle()));
page_info.thumbnail_url = "/thumb/" + entry->GetURL().spec();
- page_info.favicon_url = entry->favicon().url().spec();
+ page_info.favicon_url = entry->GetFavicon().url.spec();
page_list.push_back(page_info);
}
return page_list;
diff --git a/content/browser/download/save_package.cc b/content/browser/download/save_package.cc
index 980e927..f09c5d0 100644
--- a/content/browser/download/save_package.cc
+++ b/content/browser/download/save_package.cc
@@ -28,6 +28,7 @@
#include "content/browser/renderer_host/render_view_host_delegate.h"
#include "content/browser/renderer_host/resource_dispatcher_host.h"
#include "content/browser/resource_context.h"
+#include "content/browser/tab_contents/navigation_entry.h"
#include "content/browser/tab_contents/tab_contents.h"
#include "content/common/view_messages.h"
#include "content/public/browser/browser_context.h"
diff --git a/content/browser/renderer_host/test_render_view_host.cc b/content/browser/renderer_host/test_render_view_host.cc
index 269c730..8a6968b 100644
--- a/content/browser/renderer_host/test_render_view_host.cc
+++ b/content/browser/renderer_host/test_render_view_host.cc
@@ -8,6 +8,7 @@
#include "content/browser/renderer_host/test_render_view_host.h"
#include "content/browser/site_instance.h"
#include "content/browser/tab_contents/navigation_controller.h"
+#include "content/browser/tab_contents/navigation_entry.h"
#include "content/browser/tab_contents/test_tab_contents.h"
#include "content/common/dom_storage_common.h"
#include "content/common/view_messages.h"
diff --git a/content/browser/ssl/ssl_manager.cc b/content/browser/ssl/ssl_manager.cc
index 6544ffff..250f64c 100644
--- a/content/browser/ssl/ssl_manager.cc
+++ b/content/browser/ssl/ssl_manager.cc
@@ -16,13 +16,15 @@
#include "content/browser/tab_contents/navigation_entry.h"
#include "content/browser/tab_contents/provisional_load_details.h"
#include "content/browser/tab_contents/tab_contents.h"
-#include "content/public/browser/navigation_details.h"
#include "content/public/browser/browser_thread.h"
+#include "content/public/browser/navigation_details.h"
#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_source.h"
+#include "content/public/browser/ssl_status.h"
#include "net/base/cert_status_flags.h"
using content::BrowserThread;
+using content::SSLStatus;
using content::WebContents;
// static
@@ -145,11 +147,11 @@ void SSLManager::DidCommitProvisionalLoad(
// We may not have an entry if this is a navigation to an initial blank
// page. Reset the SSL information and add the new data we have.
- entry->ssl() = NavigationEntry::SSLStatus();
- entry->ssl().set_cert_id(ssl_cert_id);
- entry->ssl().set_cert_status(ssl_cert_status);
- entry->ssl().set_security_bits(ssl_security_bits);
- entry->ssl().set_connection_status(ssl_connection_status);
+ entry->GetSSL() = SSLStatus();
+ entry->GetSSL().cert_id = ssl_cert_id;
+ entry->GetSSL().cert_status = ssl_cert_status;
+ entry->GetSSL().security_bits = ssl_security_bits;
+ entry->GetSSL().connection_status = ssl_connection_status;
}
}
@@ -168,7 +170,7 @@ bool SSLManager::ProcessedSSLErrorFromRequest() const {
return false;
}
- return net::IsCertStatusError(entry->ssl().cert_status());
+ return net::IsCertStatusError(entry->GetSSL().cert_status);
}
void SSLManager::Observe(int type,
@@ -248,11 +250,11 @@ void SSLManager::UpdateEntry(NavigationEntry* entry) {
if (!entry)
return;
- NavigationEntry::SSLStatus original_ssl_status = entry->ssl(); // Copy!
+ SSLStatus original_ssl_status = entry->GetSSL(); // Copy!
policy()->UpdateEntry(entry, controller_->tab_contents());
- if (!entry->ssl().Equals(original_ssl_status)) {
+ if (!entry->GetSSL().Equals(original_ssl_status)) {
content::NotificationService::current()->Notify(
content::NOTIFICATION_SSL_VISIBLE_STATE_CHANGED,
content::Source<NavigationController>(controller_),
diff --git a/content/browser/ssl/ssl_policy.cc b/content/browser/ssl/ssl_policy.cc
index 86a4585..57acc78 100644
--- a/content/browser/ssl/ssl_policy.cc
+++ b/content/browser/ssl/ssl_policy.cc
@@ -18,11 +18,14 @@
#include "content/browser/tab_contents/navigation_entry.h"
#include "content/browser/tab_contents/tab_contents.h"
#include "content/public/browser/content_browser_client.h"
+#include "content/public/browser/ssl_status.h"
#include "content/public/common/url_constants.h"
#include "net/base/cert_status_flags.h"
#include "net/base/ssl_info.h"
#include "webkit/glue/resource_type.h"
+using content::SSLStatus;
+
namespace {
static const char kDot = '.';
@@ -116,26 +119,25 @@ void SSLPolicy::UpdateEntry(NavigationEntry* entry, TabContents* tab_contents) {
// An HTTPS response may not have a certificate for some reason. When that
// 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(content::SECURITY_STYLE_UNAUTHENTICATED);
+ if (!entry->GetSSL().cert_id) {
+ entry->GetSSL().security_style = content::SECURITY_STYLE_UNAUTHENTICATED;
return;
}
- if (!(entry->ssl().cert_status() & net::CERT_STATUS_COMMON_NAME_INVALID)) {
+ if (!(entry->GetSSL().cert_status & net::CERT_STATUS_COMMON_NAME_INVALID)) {
// CAs issue certificates for intranet hosts to everyone. Therefore, we
// mark intranet hosts as being non-unique.
if (IsIntranetHost(entry->GetURL().host())) {
- entry->ssl().set_cert_status(entry->ssl().cert_status() |
- net::CERT_STATUS_NON_UNIQUE_NAME);
+ entry->GetSSL().cert_status |= net::CERT_STATUS_NON_UNIQUE_NAME;
}
}
- if (net::IsCertStatusError(entry->ssl().cert_status())) {
+ if (net::IsCertStatusError(entry->GetSSL().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(
- content::SECURITY_STYLE_AUTHENTICATION_BROKEN);
+ if (!net::IsCertStatusMinorError(entry->GetSSL().cert_status)) {
+ entry->GetSSL().security_style =
+ content::SECURITY_STYLE_AUTHENTICATION_BROKEN;
}
return;
}
@@ -147,14 +149,14 @@ void SSLPolicy::UpdateEntry(NavigationEntry* entry, TabContents* tab_contents) {
if (site_instance &&
backend_->DidHostRunInsecureContent(
entry->GetURL().host(), site_instance->GetProcess()->GetID())) {
- entry->ssl().set_security_style(
- content::SECURITY_STYLE_AUTHENTICATION_BROKEN);
- entry->ssl().set_ran_insecure_content();
+ entry->GetSSL().security_style =
+ content::SECURITY_STYLE_AUTHENTICATION_BROKEN;
+ entry->GetSSL().content_status |= SSLStatus::RAN_INSECURE_CONTENT;
return;
}
if (tab_contents->DisplayedInsecureContent())
- entry->ssl().set_displayed_insecure_content();
+ entry->GetSSL().content_status |= SSLStatus::DISPLAYED_INSECURE_CONTENT;
}
void SSLPolicy::OnAllowCertificate(SSLCertErrorHandler* handler, bool allow) {
@@ -205,12 +207,12 @@ void SSLPolicy::OnCertErrorInternal(SSLCertErrorHandler* handler,
}
void SSLPolicy::InitializeEntryIfNeeded(NavigationEntry* entry) {
- if (entry->ssl().security_style() != content::SECURITY_STYLE_UNKNOWN)
+ if (entry->GetSSL().security_style != content::SECURITY_STYLE_UNKNOWN)
return;
- entry->ssl().set_security_style(entry->GetURL().SchemeIsSecure() ?
+ entry->GetSSL().security_style = entry->GetURL().SchemeIsSecure() ?
content::SECURITY_STYLE_AUTHENTICATED :
- content::SECURITY_STYLE_UNAUTHENTICATED);
+ 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 1247c09b..59e6e83 100644
--- a/content/browser/tab_contents/navigation_entry.cc
+++ b/content/browser/tab_contents/navigation_entry.cc
@@ -7,12 +7,14 @@
#include "base/string_util.h"
#include "base/utf_string_conversions.h"
#include "content/browser/site_instance.h"
-#include "content/public/browser/content_browser_client.h"
#include "content/public/common/content_constants.h"
#include "content/public/common/url_constants.h"
#include "net/base/net_util.h"
#include "ui/base/text/text_elider.h"
+using content::FaviconStatus;
+using content::SSLStatus;
+
// Use this to get a new unique ID for a NavigationEntry during construction.
// The returned ID is guaranteed to be nonzero (which is the "no ID" indicator).
static int GetUniqueIDInConstructor() {
@@ -20,20 +22,11 @@ static int GetUniqueIDInConstructor() {
return ++unique_id_counter;
}
-NavigationEntry::SSLStatus::SSLStatus()
- : security_style_(content::SECURITY_STYLE_UNKNOWN),
- cert_id_(0),
- cert_status_(0),
- security_bits_(-1),
- connection_status_(0),
- content_status_(NORMAL_CONTENT) {
-}
-
-NavigationEntry::FaviconStatus::FaviconStatus() : valid_(false) {
- bitmap_ = *content::GetContentClient()->browser()->GetDefaultFavicon();
+NavigationEntry* NavigationEntry::FromNavigationEntry(
+ content::NavigationEntry* entry) {
+ return static_cast<NavigationEntry*>(entry);
}
-
NavigationEntry::NavigationEntry()
: unique_id_(GetUniqueIDInConstructor()),
site_instance_(NULL),
@@ -166,3 +159,19 @@ void NavigationEntry::SetHasPostData(bool has_post_data) {
bool NavigationEntry::GetHasPostData() const {
return has_post_data_;
}
+
+const FaviconStatus& NavigationEntry::GetFavicon() const {
+ return favicon_;
+}
+
+FaviconStatus& NavigationEntry::GetFavicon() {
+ return favicon_;
+}
+
+const SSLStatus& NavigationEntry::GetSSL() const {
+ return ssl_;
+}
+
+SSLStatus& NavigationEntry::GetSSL() {
+ return ssl_;
+}
diff --git a/content/browser/tab_contents/navigation_entry.h b/content/browser/tab_contents/navigation_entry.h
index 27ca050..f20c047 100644
--- a/content/browser/tab_contents/navigation_entry.h
+++ b/content/browser/tab_contents/navigation_entry.h
@@ -11,165 +11,18 @@
#include "base/memory/ref_counted.h"
#include "content/browser/renderer_host/global_request_id.h"
#include "content/common/content_export.h"
+#include "content/public/browser/favicon_status.h"
#include "content/public/browser/navigation_entry.h"
+#include "content/public/browser/ssl_status.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"
class SiteInstance;
class CONTENT_EXPORT NavigationEntry
: public NON_EXPORTED_BASE(content::NavigationEntry) {
public:
- // SSL -----------------------------------------------------------------------
-
- // Collects the SSL information for this NavigationEntry.
- class SSLStatus {
- public:
- // Flags used for the page security content status.
- enum ContentStatusFlags {
- // HTTP page, or HTTPS page with no insecure content.
- NORMAL_CONTENT = 0,
-
- // HTTPS page containing "displayed" HTTP resources (e.g. images, CSS).
- DISPLAYED_INSECURE_CONTENT = 1 << 0,
-
- // HTTPS page containing "executed" HTTP resources (i.e. script).
- // Also currently used for HTTPS page containing broken-HTTPS resources;
- // this is wrong and should be fixed (see comments in
- // SSLPolicy::OnRequestStarted()).
- RAN_INSECURE_CONTENT = 1 << 1,
- };
-
- CONTENT_EXPORT SSLStatus();
-
- bool Equals(const SSLStatus& status) const {
- return security_style_ == status.security_style_ &&
- cert_id_ == status.cert_id_ &&
- cert_status_ == status.cert_status_ &&
- security_bits_ == status.security_bits_ &&
- content_status_ == status.content_status_;
- }
-
- void set_security_style(content::SecurityStyle security_style) {
- security_style_ = security_style;
- }
- content::SecurityStyle security_style() const {
- return security_style_;
- }
-
- void set_cert_id(int ssl_cert_id) {
- cert_id_ = ssl_cert_id;
- }
- int cert_id() const {
- return cert_id_;
- }
-
- void set_cert_status(net::CertStatus ssl_cert_status) {
- cert_status_ = ssl_cert_status;
- }
- net::CertStatus cert_status() const {
- return cert_status_;
- }
-
- void set_security_bits(int security_bits) {
- security_bits_ = security_bits;
- }
- int security_bits() const {
- return security_bits_;
- }
-
- void set_displayed_insecure_content() {
- content_status_ |= DISPLAYED_INSECURE_CONTENT;
- }
- bool displayed_insecure_content() const {
- return (content_status_ & DISPLAYED_INSECURE_CONTENT) != 0;
- }
-
- void set_ran_insecure_content() {
- content_status_ |= RAN_INSECURE_CONTENT;
- }
- bool ran_insecure_content() const {
- return (content_status_ & RAN_INSECURE_CONTENT) != 0;
- }
-
- void set_connection_status(int connection_status) {
- connection_status_ = connection_status;
- }
- int connection_status() const {
- return connection_status_;
- }
-
- // Raw accessors for all the content status flags. This contains a
- // combination of any of the ContentStatusFlags defined above. It is used
- // by some tests for checking and for certain copying. Use the per-status
- // functions for normal usage.
- void set_content_status(int content_status) {
- content_status_ = content_status;
- }
- int content_status() const {
- return content_status_;
- }
-
- private:
- // See the accessors above for descriptions.
- content::SecurityStyle security_style_;
- int cert_id_;
- net::CertStatus cert_status_;
- int security_bits_;
- int connection_status_;
- int content_status_;
-
- // Copy and assignment is explicitly allowed for this class.
- };
-
- // Favicon -------------------------------------------------------------------
-
- // Collects the favicon related information for a NavigationEntry.
- class FaviconStatus {
- public:
- FaviconStatus();
-
- // Indicates whether we've gotten an official favicon for the page, or are
- // just using the default favicon.
- void set_is_valid(bool is_valid) {
- valid_ = is_valid;
- }
- bool is_valid() const {
- return valid_;
- }
-
- // The URL of the favicon which was used to load it off the web.
- void set_url(const GURL& favicon_url) {
- url_ = favicon_url;
- }
- const GURL& url() const {
- return url_;
- }
-
- // The favicon bitmap for the page. If the favicon has not been explicitly
- // set or it empty, it will return the default favicon. Note that this is
- // loaded asynchronously, so even if the favicon URL is valid we may return
- // the default favicon if we haven't gotten the data yet.
- void set_bitmap(const SkBitmap& bitmap) {
- bitmap_ = bitmap;
- }
- const SkBitmap& bitmap() const {
- return bitmap_;
- }
-
- private:
- // See the accessors above for descriptions.
- bool valid_;
- GURL url_;
- SkBitmap bitmap_;
-
- // Copy and assignment is explicitly allowed for this class.
- };
- // ---------------------------------------------------------------------------
+ NavigationEntry* FromNavigationEntry(content::NavigationEntry* entry);
NavigationEntry();
NavigationEntry(SiteInstance* instance,
@@ -199,6 +52,10 @@ class CONTENT_EXPORT NavigationEntry
virtual content::PageTransition GetTransitionType() const OVERRIDE;
virtual void SetHasPostData(bool has_post_data) OVERRIDE;
virtual bool GetHasPostData() const OVERRIDE;
+ virtual const content::FaviconStatus& GetFavicon() const OVERRIDE;
+ virtual content::FaviconStatus& GetFavicon() OVERRIDE;
+ virtual const content::SSLStatus& GetSSL() const OVERRIDE;
+ virtual content::SSLStatus& GetSSL() OVERRIDE;
void set_unique_id(int unique_id) {
unique_id_ = unique_id;
@@ -249,22 +106,6 @@ class CONTENT_EXPORT NavigationEntry
update_virtual_url_with_url_ = update;
}
- // The favicon data and tracking information. See FaviconStatus above.
- const FaviconStatus& favicon() const {
- return favicon_;
- }
- FaviconStatus& favicon() {
- return favicon_;
- }
-
- // All the SSL flags and state. See SSLStatus above.
- const SSLStatus& ssl() const {
- return ssl_;
- }
- SSLStatus& ssl() {
- return ssl_;
- }
-
// Extra headers (separated by \n) to send during the request.
void set_extra_headers(const std::string& extra_headers) {
extra_headers_ = extra_headers;
@@ -345,10 +186,10 @@ class CONTENT_EXPORT NavigationEntry
GURL virtual_url_;
bool update_virtual_url_with_url_;
string16 title_;
- FaviconStatus favicon_;
+ content::FaviconStatus favicon_;
std::string content_state_;
int32 page_id_;
- SSLStatus ssl_;
+ content::SSLStatus ssl_;
content::PageTransition transition_type_;
GURL user_typed_url_;
bool has_post_data_;
diff --git a/content/browser/tab_contents/navigation_entry_unittest.cc b/content/browser/tab_contents/navigation_entry_unittest.cc
index 061729f..0eb4ade 100644
--- a/content/browser/tab_contents/navigation_entry_unittest.cc
+++ b/content/browser/tab_contents/navigation_entry_unittest.cc
@@ -7,8 +7,11 @@
#include "base/utf_string_conversions.h"
#include "content/browser/site_instance.h"
#include "content/browser/tab_contents/navigation_entry.h"
+#include "content/public/browser/ssl_status.h"
#include "testing/gtest/include/gtest/gtest.h"
+using content::SSLStatus;
+
class NavigationEntryTest : public testing::Test {
public:
NavigationEntryTest() : instance_(NULL) {
@@ -89,52 +92,25 @@ TEST_F(NavigationEntryTest, NavigationEntryURLs) {
EXPECT_EQ(GURL("typedurl"), entry2_.get()->user_typed_url());
}
-// Test Favicon inner class
+// Test Favicon inner class construction.
TEST_F(NavigationEntryTest, NavigationEntryFavicons) {
- EXPECT_EQ(GURL(), entry1_.get()->favicon().url());
- entry1_.get()->favicon().set_url(GURL("icon"));
- EXPECT_EQ(GURL("icon"), entry1_.get()->favicon().url());
-
- // Validity not affected by setting URL
- EXPECT_FALSE(entry1_.get()->favicon().is_valid());
- entry1_.get()->favicon().set_is_valid(true);
- EXPECT_TRUE(entry1_.get()->favicon().is_valid());
+ EXPECT_EQ(GURL(), entry1_.get()->GetFavicon().url);
+ EXPECT_FALSE(entry1_.get()->GetFavicon().valid);
}
// Test SSLStatus inner class
TEST_F(NavigationEntryTest, NavigationEntrySSLStatus) {
// Default (unknown)
EXPECT_EQ(content::SECURITY_STYLE_UNKNOWN,
- entry1_.get()->ssl().security_style());
+ entry1_.get()->GetSSL().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());
- EXPECT_FALSE(entry1_.get()->ssl().displayed_insecure_content());
- EXPECT_FALSE(entry1_.get()->ssl().ran_insecure_content());
-
- // Change from the defaults
- 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(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,
- entry2_.get()->ssl().cert_status());
- EXPECT_EQ(0, entry2_.get()->ssl().security_bits());
- EXPECT_TRUE(entry2_.get()->ssl().displayed_insecure_content());
-
- entry2_.get()->ssl().set_security_style(
- content::SECURITY_STYLE_AUTHENTICATION_BROKEN);
- entry2_.get()->ssl().set_ran_insecure_content();
- EXPECT_EQ(content::SECURITY_STYLE_AUTHENTICATION_BROKEN,
- entry2_.get()->ssl().security_style());
- EXPECT_TRUE(entry2_.get()->ssl().ran_insecure_content());
+ entry2_.get()->GetSSL().security_style);
+ EXPECT_EQ(0, entry1_.get()->GetSSL().cert_id);
+ EXPECT_EQ(0U, entry1_.get()->GetSSL().cert_status);
+ EXPECT_EQ(-1, entry1_.get()->GetSSL().security_bits);
+ int content_status = entry1_.get()->GetSSL().content_status;
+ EXPECT_FALSE(!!(content_status & SSLStatus::DISPLAYED_INSECURE_CONTENT));
+ EXPECT_FALSE(!!(content_status & SSLStatus::RAN_INSECURE_CONTENT));
}
// Test other basic accessors
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index 4a440df..3330a24 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -111,6 +111,7 @@ using content::DevToolsAgentHostRegistry;
using content::DevToolsManagerImpl;
using content::DownloadItem;
using content::DownloadManager;
+using content::SSLStatus;
using content::UserMetricsAction;
using content::WebContents;
using content::WebContentsObserver;
@@ -642,7 +643,7 @@ TabContents* TabContents::Clone() {
}
void TabContents::ShowPageInfo(const GURL& url,
- const NavigationEntry::SSLStatus& ssl,
+ const SSLStatus& ssl,
bool show_history) {
if (!delegate_)
return;
diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h
index c26c3f4..d23024d 100644
--- a/content/browser/tab_contents/tab_contents.h
+++ b/content/browser/tab_contents/tab_contents.h
@@ -165,7 +165,7 @@ class CONTENT_EXPORT TabContents
virtual void Stop() OVERRIDE;
virtual TabContents* Clone() OVERRIDE;
virtual void ShowPageInfo(const GURL& url,
- const NavigationEntry::SSLStatus& ssl,
+ const content::SSLStatus& ssl,
bool show_history) OVERRIDE;
virtual void AddNewContents(TabContents* new_contents,
WindowOpenDisposition disposition,
diff --git a/content/browser/tab_contents/test_tab_contents.cc b/content/browser/tab_contents/test_tab_contents.cc
index a63ceb5..7ec09ba 100644
--- a/content/browser/tab_contents/test_tab_contents.cc
+++ b/content/browser/tab_contents/test_tab_contents.cc
@@ -11,6 +11,7 @@
#include "content/browser/renderer_host/render_view_host.h"
#include "content/browser/renderer_host/test_render_view_host.h"
#include "content/browser/site_instance.h"
+#include "content/browser/tab_contents/navigation_entry.h"
#include "content/common/view_messages.h"
#include "content/public/common/page_transition_types.h"
#include "webkit/glue/webkit_glue.h"
diff --git a/content/browser/tab_contents/web_drag_source_gtk.cc b/content/browser/tab_contents/web_drag_source_gtk.cc
index d78990c..00f738b 100644
--- a/content/browser/tab_contents/web_drag_source_gtk.cc
+++ b/content/browser/tab_contents/web_drag_source_gtk.cc
@@ -20,6 +20,7 @@
#include "content/public/browser/content_browser_client.h"
#include "net/base/file_stream.h"
#include "net/base/net_util.h"
+#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/clipboard/custom_data_helper.h"
#include "ui/base/dragdrop/gtk_dnd_util.h"
#include "ui/base/gtk/gtk_compat.h"
generated by cgit v1.1 at 2025-03-28 07:52:58 +0000