Revert "Revert 137734 - Select theme resources from ResourceBundle at requested scale factor."

content/browser/debugger/devtools_http_handler_impl.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/debugger/devtools_http_handler_impl.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 20 matching lines @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/common/content_client.h"
 #include "googleurl/src/gurl.h"
 #include "grit/devtools_resources_map.h"
 #include "net/base/escape.h"
 #include "net/base/io_buffer.h"
 #include "net/server/http_server_request_info.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_getter.h"
+#include "ui/base/layout.h"
 
 namespace content {
 
 const int kBufferSize = 16 * 1024;
 
 namespace {
 
 class DevToolsDefaultBindingHandler
     : public DevToolsHttpHandler::RenderViewHostBinding {
  public:
@@ skipping 170 matching lines @@
   net::URLRequest* request;
 
   if (info.path.find("/devtools/") == 0) {
     // Serve front-end files from resource bundle.
     std::string filename = PathWithoutParams(info.path.substr(10));
 
     if (delegate_->BundlesFrontendResources()) {
       int resource_id = DevToolsHttpHandler::GetFrontendResourceId(filename);
       if (resource_id != -1) {
         base::StringPiece data =
-            content::GetContentClient()->GetDataResource(resource_id);
+            content::GetContentClient()->GetDataResource(
+                resource_id, ui::SCALE_FACTOR_NONE);
         server_->Send200(connection_id,
                          data.as_string(),
                          GetMimeType(filename));
       }
       return;
     }
     std::string base_url = delegate_->GetFrontendResourcesBaseURL();
     request = new net::URLRequest(GURL(base_url + filename), this);
   } else if (info.path.find("/thumb/") == 0) {
     request = new net::URLRequest(GURL("chrome:/" + info.path), this);
@@ skipping 371 matching lines @@
 void DevToolsHttpHandlerImpl::AcceptWebSocket(
     int connection_id,
     const net::HttpServerRequestInfo& request) {
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&net::HttpServer::AcceptWebSocket, server_.get(),
                  connection_id, request));
 }
 
 }  // namespace content