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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/shell/shell_devtools_delegate.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 side-by-side diff with in-line comments
Download patch
« chrome/browser/extensions/extension_protocols.cc ('K') | « content/shell/shell_content_client.cc ('k') | content/test/test_content_client.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell_devtools_delegate.cc
diff --git a/content/shell/shell_devtools_delegate.cc b/content/shell/shell_devtools_delegate.cc
index 15cdce8bb6fdea408b687fdadf04deb819b100bc..cf35cd17df359a2d617fee8960e016c138e5407e 100644
--- a/content/shell/shell_devtools_delegate.cc
+++ b/content/shell/shell_devtools_delegate.cc
@@ -9,6 +9,7 @@
#include "content/public/browser/devtools_http_handler.h"
#include "grit/shell_resources.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() {
« chrome/browser/extensions/extension_protocols.cc ('K') | « content/shell/shell_content_client.cc ('k') | content/test/test_content_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698