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

Unified Diff: chrome/browser/translate/translate_manager.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
« no previous file with comments | « chrome/browser/themes/theme_service.cc ('k') | chrome/browser/ui/pdf/pdf_unsupported_feature.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/translate/translate_manager.cc
diff --git a/chrome/browser/translate/translate_manager.cc b/chrome/browser/translate/translate_manager.cc
index a8c7ea2428302352bbca92c0c3ce19e2589d13e4..6574d504a13ce5ac4164b300551f5f49c252f923 100644
--- a/chrome/browser/translate/translate_manager.cc
+++ b/chrome/browser/translate/translate_manager.cc
@@ -50,6 +50,7 @@
#include "net/base/escape.h"
#include "net/base/load_flags.h"
#include "net/url_request/url_request_status.h"
+#include "ui/base/layout.h"
#include "ui/base/resource/resource_bundle.h"
#ifdef FILE_MANAGER_EXTENSION
@@ -427,7 +428,8 @@ void TranslateManager::OnURLFetchComplete(const net::URLFetcher* source) {
translate_script_request_pending_.release());
if (!error) {
base::StringPiece str = ResourceBundle::GetSharedInstance().
- GetRawDataResource(IDR_TRANSLATE_JS);
+ GetRawDataResource(IDR_TRANSLATE_JS,
+ ui::SCALE_FACTOR_NONE);
DCHECK(translate_script_.empty());
str.CopyToString(&translate_script_);
std::string data;
« no previous file with comments | « chrome/browser/themes/theme_service.cc ('k') | chrome/browser/ui/pdf/pdf_unsupported_feature.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698