chrome/browser/ui/webui/devtools_ui.cc - Issue 10412004: Revert "Revert 137734 - Select theme resources from ResourceBundle at requested scale factor."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 10412004: Revert "Revert 137734 - 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 side-by-side diff with in-line comments

Download patch

Index: chrome/browser/ui/webui/devtools_ui.cc

diff --git a/chrome/browser/ui/webui/devtools_ui.cc b/chrome/browser/ui/webui/devtools_ui.cc

index 14b04f4735e22e750ac903fcb170030ec1541ce7..a58de6ab8a1dee33eabb026a3cd7ac85e002b331 100644

--- a/chrome/browser/ui/webui/devtools_ui.cc

+++ b/chrome/browser/ui/webui/devtools_ui.cc

@@ -19,6 +19,7 @@

#include "content/public/browser/render_view_host.h"

#include "content/public/browser/web_contents.h"

#include "content/public/browser/web_ui.h"

+#include "ui/base/layout.h"

#include "ui/base/resource/resource_bundle.h"

using content::BrowserThread;

@@ -66,7 +67,7 @@ void DevToolsDataSource::StartDataRequest(const std::string& path,

" with --debug-devtools.";

const ResourceBundle& rb = ResourceBundle::GetSharedInstance();

scoped_refptr<base::RefCountedStaticMemory> bytes(rb.LoadDataResourceBytes(

- resource_id));

+ resource_id, ui::SCALE_FACTOR_NONE));

SendResponse(request_id, bytes);

}

« no previous file with comments | « chrome/browser/ui/webui/crashes_ui.cc ('k') | chrome/browser/ui/webui/downloads_ui.cc » ('j') | no next file with comments »