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

Side by Side Diff: chrome/browser/extensions/url_request_util.cc

Issue 370833002: Move resource_type.* from webkit/ to content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: chromeos fix Created 6 years, 5 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/url_request_util.h" 5 #include "chrome/browser/extensions/url_request_util.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/memory/weak_ptr.h" 10 #include "base/memory/weak_ptr.h"
(...skipping 18 matching lines...) Expand all
29 #include "net/base/mime_util.h" 29 #include "net/base/mime_util.h"
30 #include "net/base/net_errors.h" 30 #include "net/base/net_errors.h"
31 #include "net/http/http_request_headers.h" 31 #include "net/http/http_request_headers.h"
32 #include "net/http/http_response_headers.h" 32 #include "net/http/http_response_headers.h"
33 #include "net/http/http_response_info.h" 33 #include "net/http/http_response_info.h"
34 #include "net/url_request/url_request.h" 34 #include "net/url_request/url_request.h"
35 #include "net/url_request/url_request_simple_job.h" 35 #include "net/url_request/url_request_simple_job.h"
36 #include "ui/base/resource/resource_bundle.h" 36 #include "ui/base/resource/resource_bundle.h"
37 37
38 using content::BrowserThread; 38 using content::BrowserThread;
39 using content::ResourceType;
39 using extensions::ExtensionsBrowserClient; 40 using extensions::ExtensionsBrowserClient;
40 41
41 namespace { 42 namespace {
42 43
43 // A request for an extension resource in a Chrome .pak file. These are used 44 // A request for an extension resource in a Chrome .pak file. These are used
44 // by component extensions. 45 // by component extensions.
45 class URLRequestResourceBundleJob : public net::URLRequestSimpleJob { 46 class URLRequestResourceBundleJob : public net::URLRequestSimpleJob {
46 public: 47 public:
47 URLRequestResourceBundleJob(net::URLRequest* request, 48 URLRequestResourceBundleJob(net::URLRequest* request,
48 net::NetworkDelegate* network_delegate, 49 net::NetworkDelegate* network_delegate,
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
254 return false; 255 return false;
255 #if defined(ENABLE_EXTENSIONS) 256 #if defined(ENABLE_EXTENSIONS)
256 return WebViewRendererState::GetInstance()->IsGuest(info->GetChildID()); 257 return WebViewRendererState::GetInstance()->IsGuest(info->GetChildID());
257 #else 258 #else
258 return false; 259 return false;
259 #endif 260 #endif
260 } 261 }
261 262
262 } // namespace url_request_util 263 } // namespace url_request_util
263 } // namespace extensions 264 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698