content/shell/shell_devtools_delegate.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: content/shell/shell_devtools_delegate.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: content/shell/shell_devtools_delegate.cc

diff --git a/content/shell/shell_devtools_delegate.cc b/content/shell/shell_devtools_delegate.cc

index b0a6da6fe4c72dd1252657d30c085ac6cb25e5c7..58427da8307c7e1a993fccec765262102df2c986 100644

--- a/content/shell/shell_devtools_delegate.cc

+++ b/content/shell/shell_devtools_delegate.cc

@@ -10,6 +10,7 @@

#include "grit/shell_resources.h"

#include "net/base/tcp_listen_socket.h"

#include "net/url_request/url_request_context_getter.h"

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

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

namespace content {

@@ -35,7 +36,8 @@ void ShellDevToolsDelegate::Stop() {

std::string ShellDevToolsDelegate::GetDiscoveryPageHTML() {

return ResourceBundle::GetSharedInstance().GetRawDataResource(

- IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE).as_string();

+ IDR_CONTENT_SHELL_DEVTOOLS_DISCOVERY_PAGE,

+ ui::SCALE_FACTOR_NONE).as_string();

}

bool ShellDevToolsDelegate::BundlesFrontendResources() {

« no previous file with comments | « content/shell/shell_content_client.cc ('k') | content/test/test_content_client.h » ('j') | no next file with comments »