Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4358)

Unified Diff: chrome/browser/ui/webui/chrome_url_data_manager_backend.cc

Issue 10454044: Added support for animated/nonanimated user image. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Small fixes to comments. Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/webui/chrome_url_data_manager_backend.cc
diff --git a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc
index baa09d9010658d116f1fa0d3e7b7b4c7136bcc21..753e25f8a46da90ac59a4827c3119b18521e6fd3 100644
--- a/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc
+++ b/chrome/browser/ui/webui/chrome_url_data_manager_backend.cc
@@ -13,6 +13,7 @@
#include "base/debug/trace_event.h"
#include "base/file_util.h"
#include "base/lazy_instance.h"
+#include "base/memory/ref_counted.h"
#include "base/memory/ref_counted_memory.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop.h"
@@ -170,6 +171,9 @@ class URLRequestChromeJob : public net::URLRequestJob {
virtual bool GetMimeType(std::string* mime_type) const OVERRIDE;
virtual void GetResponseInfo(net::HttpResponseInfo* info) OVERRIDE;
+ // Used to notify us that the data mime type is ready for us.
James Hawkins 2012/06/04 15:50:13 nit: Don't use pronouns (us) in comments; pronouns
James Hawkins 2012/06/04 15:50:13 s/mime type/|mime_type|/
ygorshenin1 2012/06/09 09:34:26 Done.
ygorshenin1 2012/06/09 09:34:26 Done.
+ void MimeTypeAvailable(const std::string& mime_type);
+
// Called by ChromeURLDataManager to notify us that the data blob is ready
// for us.
void DataAvailable(base::RefCountedMemory* bytes);
@@ -263,6 +267,11 @@ void URLRequestChromeJob::GetResponseInfo(net::HttpResponseInfo* info) {
info->headers->AddHeader("Cache-Control: no-cache");
}
+void URLRequestChromeJob::MimeTypeAvailable(const std::string& mime_type) {
+ set_mime_type(mime_type);
+ NotifyHeadersComplete();
+}
+
void URLRequestChromeJob::DataAvailable(base::RefCountedMemory* bytes) {
TRACE_EVENT_ASYNC_END0("browser", "DataManager:Request", this);
if (bytes) {
@@ -317,9 +326,7 @@ void URLRequestChromeJob::StartAsync() {
if (!request_)
return;
- if (backend_->StartRequest(request_->url(), this)) {
- NotifyHeadersComplete();
- } else {
+ if (!backend_->StartRequest(request_->url(), this)) {
NotifyStartError(net::URLRequestStatus(net::URLRequestStatus::FAILED,
net::ERR_INVALID_URL));
}
@@ -327,6 +334,20 @@ void URLRequestChromeJob::StartAsync() {
namespace {
James Hawkins 2012/06/04 15:50:13 There's already an unnamed namespace at the top of
ygorshenin1 2012/06/09 09:34:26 It can't be moved before URLRequestChromeJob decla
+void GetMimeTypeOnUI(ChromeURLDataManager::DataSource* source,
James Hawkins 2012/06/04 15:50:13 nit: Document method and parameters.
ygorshenin1 2012/06/09 09:34:26 Done.
+ const std::string& path,
+ URLRequestChromeJob* job) {
+ DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+ std::string mime_type = source->GetMimeType(path);
+ BrowserThread::PostTask(
+ BrowserThread::IO, FROM_HERE,
+ base::Bind(&URLRequestChromeJob::MimeTypeAvailable, job, mime_type));
+}
+
+} // namespace
+
+namespace {
+
class ChromeProtocolHandler
: public net::URLRequestJobFactory::ProtocolHandler {
public:
@@ -421,10 +442,6 @@ bool ChromeURLDataManagerBackend::StartRequest(const GURL& url,
RequestID request_id = next_request_id_++;
pending_requests_.insert(std::make_pair(request_id, job));
- // TODO(eroman): would be nicer if the mimetype were set at the same time
- // as the data blob. For now do it here, since NotifyHeadersComplete() is
- // going to get called once we return.
- job->set_mime_type(source->GetMimeType(path));
job->set_allow_caching(source->AllowCaching());
const ChromeURLRequestContext* context =
@@ -433,11 +450,24 @@ bool ChromeURLDataManagerBackend::StartRequest(const GURL& url,
// Forward along the request to the data source.
MessageLoop* target_message_loop = source->MessageLoopForRequestPath(path);
if (!target_message_loop) {
+ job->MimeTypeAvailable(source->GetMimeType(path));
+
// The DataSource is agnostic to which thread StartDataRequest is called
// on for this path. Call directly into it from this thread, the IO
// thread.
source->StartDataRequest(path, context->is_incognito(), request_id);
} else {
+ // URLRequestChromeJob should receive mime type before data. This
+ // is guaranteed because request for mime type is placed in the
+ // message loop before request for data. And correspondingly their
+ // replies are put on the IO thread in the same order.
+ target_message_loop->PostTask(
+ FROM_HERE,
+ base::Bind(&GetMimeTypeOnUI,
+ scoped_refptr<ChromeURLDataManager::DataSource>(source),
+ path,
+ scoped_refptr<URLRequestChromeJob>(job)));
+
// The DataSource wants StartDataRequest to be called on a specific thread,
// usually the UI thread, for this path.
target_message_loop->PostTask(

Powered by Google App Engine
This is Rietveld 408576698