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

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

Issue 10387010: Select theme resources from ResourceBundle at requested scale factor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/extensions/extension_host.cc ('k') | chrome/browser/first_run/first_run_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/extension_protocols.h" 5 #include "chrome/browser/extensions/extension_protocols.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/message_loop.h" 12 #include "base/message_loop.h"
13 #include "base/path_service.h" 13 #include "base/path_service.h"
14 #include "base/string_util.h" 14 #include "base/string_util.h"
15 #include "base/stringprintf.h" 15 #include "base/stringprintf.h"
16 #include "base/threading/thread_restrictions.h" 16 #include "base/threading/thread_restrictions.h"
17 #include "build/build_config.h" 17 #include "build/build_config.h"
18 #include "chrome/browser/extensions/extension_info_map.h" 18 #include "chrome/browser/extensions/extension_info_map.h"
19 #include "chrome/browser/net/chrome_url_request_context.h" 19 #include "chrome/browser/net/chrome_url_request_context.h"
20 #include "chrome/common/chrome_paths.h" 20 #include "chrome/common/chrome_paths.h"
21 #include "chrome/common/extensions/extension.h" 21 #include "chrome/common/extensions/extension.h"
22 #include "chrome/common/extensions/extension_file_util.h" 22 #include "chrome/common/extensions/extension_file_util.h"
23 #include "chrome/common/extensions/extension_resource.h" 23 #include "chrome/common/extensions/extension_resource.h"
24 #include "chrome/common/url_constants.h" 24 #include "chrome/common/url_constants.h"
25 #include "content/public/browser/resource_request_info.h" 25 #include "content/public/browser/resource_request_info.h"
26 #include "googleurl/src/url_util.h" 26 #include "googleurl/src/url_util.h"
27 #include "grit/component_extension_resources_map.h" 27 #include "grit/component_extension_resources_map.h"
28 #include "net/base/mime_util.h" 28 #include "net/base/mime_util.h"
29 #include "net/base/net_errors.h" 29 #include "net/base/net_errors.h"
30 #include "net/http/http_response_headers.h"
30 #include "net/http/http_response_info.h" 31 #include "net/http/http_response_info.h"
31 #include "net/http/http_response_headers.h"
32 #include "net/url_request/url_request_error_job.h" 32 #include "net/url_request/url_request_error_job.h"
33 #include "net/url_request/url_request_file_job.h" 33 #include "net/url_request/url_request_file_job.h"
34 #include "net/url_request/url_request_simple_job.h" 34 #include "net/url_request/url_request_simple_job.h"
35 #include "ui/base/layout.h"
35 #include "ui/base/resource/resource_bundle.h" 36 #include "ui/base/resource/resource_bundle.h"
36 37
37 using content::ResourceRequestInfo; 38 using content::ResourceRequestInfo;
38 39
39 namespace { 40 namespace {
40 41
41 net::HttpResponseHeaders* BuildHttpHeaders( 42 net::HttpResponseHeaders* BuildHttpHeaders(
42 const std::string& content_security_policy, bool send_cors_header) { 43 const std::string& content_security_policy, bool send_cors_header) {
43 std::string raw_headers; 44 std::string raw_headers;
44 raw_headers.append("HTTP/1.1 200 OK"); 45 raw_headers.append("HTTP/1.1 200 OK");
(...skipping 21 matching lines...) Expand all
66 resource_id_(resource_id) { 67 resource_id_(resource_id) {
67 response_info_.headers = BuildHttpHeaders(content_security_policy, 68 response_info_.headers = BuildHttpHeaders(content_security_policy,
68 send_cors_header); 69 send_cors_header);
69 } 70 }
70 71
71 // Overridden from URLRequestSimpleJob: 72 // Overridden from URLRequestSimpleJob:
72 virtual bool GetData(std::string* mime_type, 73 virtual bool GetData(std::string* mime_type,
73 std::string* charset, 74 std::string* charset,
74 std::string* data) const OVERRIDE { 75 std::string* data) const OVERRIDE {
75 const ResourceBundle& rb = ResourceBundle::GetSharedInstance(); 76 const ResourceBundle& rb = ResourceBundle::GetSharedInstance();
76 *data = rb.GetRawDataResource(resource_id_).as_string(); 77 *data = rb.GetRawDataResource(
78 resource_id_, ui::SCALE_FACTOR_NONE).as_string();
Aaron Boodman 2012/05/17 20:54:02 It seems kinda silly to have to pass a scale facto
77 79
78 // Requests should not block on the disk! On Windows this goes to the 80 // Requests should not block on the disk! On Windows this goes to the
79 // registry. 81 // registry.
80 // http://code.google.com/p/chromium/issues/detail?id=59849 82 // http://code.google.com/p/chromium/issues/detail?id=59849
81 bool result; 83 bool result;
82 { 84 {
83 base::ThreadRestrictions::ScopedAllowIO allow_io; 85 base::ThreadRestrictions::ScopedAllowIO allow_io;
84 result = net::GetMimeTypeFromFile(filename_, mime_type); 86 result = net::GetMimeTypeFromFile(filename_, mime_type);
85 } 87 }
86 88
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after
327 content_security_policy, send_cors_header); 329 content_security_policy, send_cors_header);
328 } 330 }
329 331
330 } // namespace 332 } // namespace
331 333
332 net::URLRequestJobFactory::ProtocolHandler* CreateExtensionProtocolHandler( 334 net::URLRequestJobFactory::ProtocolHandler* CreateExtensionProtocolHandler(
333 bool is_incognito, 335 bool is_incognito,
334 ExtensionInfoMap* extension_info_map) { 336 ExtensionInfoMap* extension_info_map) {
335 return new ExtensionProtocolHandler(is_incognito, extension_info_map); 337 return new ExtensionProtocolHandler(is_incognito, extension_info_map);
336 } 338 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_host.cc ('k') | chrome/browser/first_run/first_run_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698