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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/shell/shell_content_client.h

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/layout_test_controller_bindings.cc ('k') | content/shell/shell_content_client.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell_content_client.h
diff --git a/content/shell/shell_content_client.h b/content/shell/shell_content_client.h
index d8b216e605a0c55e92849d5e846f937f09491fb6..1d3aeda9ffd9101cf8fcd1e16d6f95b58ec1d9b4 100644
--- a/content/shell/shell_content_client.h
+++ b/content/shell/shell_content_client.h
@@ -31,9 +31,9 @@ class ShellContentClient : public ContentClient {
virtual bool CanHandleWhileSwappedOut(const IPC::Message& msg) OVERRIDE;
virtual std::string GetUserAgent() const OVERRIDE;
virtual string16 GetLocalizedString(int message_id) const OVERRIDE;
- virtual base::StringPiece GetDataResource(int resource_id) const OVERRIDE;
- virtual base::StringPiece GetImageResource(int resource_id,
- float scale_factor) const OVERRIDE;
+ virtual base::StringPiece GetDataResource(
+ int resource_id,
+ ui::ScaleFactor scale_factor) const OVERRIDE;
#if defined(OS_WIN)
virtual bool SandboxPlugin(CommandLine* command_line,
« chrome/browser/extensions/extension_protocols.cc ('K') | « content/shell/layout_test_controller_bindings.cc ('k') | content/shell/shell_content_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698