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

Unified Diff: webkit/tools/test_shell/test_shell_gtk.cc

Issue 10387010: Select theme resources from ResourceBundle at requested scale factor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Convert ptr to bool for win compile. 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: webkit/tools/test_shell/test_shell_gtk.cc
diff --git a/webkit/tools/test_shell/test_shell_gtk.cc b/webkit/tools/test_shell/test_shell_gtk.cc
index 59f14099921c8a7024a6638700dbb84be1dc6497..99e26a7dc1425974da22fb6ce2cca099362897a6 100644
--- a/webkit/tools/test_shell/test_shell_gtk.cc
+++ b/webkit/tools/test_shell/test_shell_gtk.cc
@@ -27,6 +27,7 @@
#include "third_party/WebKit/Source/WebKit/chromium/public/WebView.h"
#include "ui/base/gtk/gtk_compat.h"
#include "ui/base/resource/resource_bundle.h"
+#include "ui/base/resource/resource_handle.h"
#include "webkit/glue/resource_loader_bridge.h"
#include "webkit/glue/webkit_glue.h"
#include "webkit/glue/webpreferences.h"
@@ -559,7 +560,8 @@ void TestShell::ShowStartupDebuggingDialog() {
// static
base::StringPiece TestShell::ResourceProvider(int key) {
- return ResourceBundle::GetSharedInstance().GetRawDataResource(key);
+ return ResourceBundle::GetSharedInstance().GetRawDataResource(
+ key, ui::ResourceHandle::kScaleFactorNone);
}
//-----------------------------------------------------------------------------
« ui/base/resource/resource_handle.h ('K') | « webkit/support/platform_support_linux.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698