diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-27 21:38:17 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-27 21:38:17 +0000 |
| commit | d583e3f2463dd1d216c92923e2eb9a9ba6066676 (patch) | |
| tree | dcb942878d5bd6b548ae28555df88f49cdb988cc /content/browser/debugger | |
| parent | 4806e850ba4d2fbc633ff2efebef757fbd050a8f (diff) | |
| download | chromium_src-d583e3f2463dd1d216c92923e2eb9a9ba6066676.zip chromium_src-d583e3f2463dd1d216c92923e2eb9a9ba6066676.tar.gz chromium_src-d583e3f2463dd1d216c92923e2eb9a9ba6066676.tar.bz2 | |
Move FaviconStatus and SSLStatus out of NavigationEntry into their own files in content/public and in the content namespace. I've also made them structs instead of classes. This was because I didn't want to wrap them with Content API for what were really a collection of member variables. The one exception was SSLStatus::content_status which had helper functions around it to set and get the bitfield. Each of the two setter helpers were only called in one non-test code, and read in a few places, so I just converted them to do it directly.
BUG=98716
Review URL: http://codereview.chromium.org/9048002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@115847 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/debugger')
| -rw-r--r-- | content/browser/debugger/devtools_http_handler_impl.cc | 3 |
1 files changed, 2 insertions, 1 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; |