chrome/browser/notifications/desktop_notification_service.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: chrome/browser/notifications/desktop_notification_service.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: chrome/browser/notifications/desktop_notification_service.cc

diff --git a/chrome/browser/notifications/desktop_notification_service.cc b/chrome/browser/notifications/desktop_notification_service.cc

index f8527ab3556fea41b10fffc94585207bc06df909..7fa452228ca410bef8dd6fa2bbaee4db0e9a52a3 100644

--- a/chrome/browser/notifications/desktop_notification_service.cc

+++ b/chrome/browser/notifications/desktop_notification_service.cc

@@ -41,6 +41,7 @@

#include "net/base/escape.h"

#include "third_party/WebKit/Source/WebKit/chromium/public/WebSecurityOrigin.h"

#include "ui/base/l10n/l10n_util.h"

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

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

using content::BrowserThread;

@@ -205,7 +206,7 @@ string16 DesktopNotificationService::CreateDataUrl(

int resource, const std::vector<std::string>& subst) {

const base::StringPiece template_html(

ResourceBundle::GetSharedInstance().GetRawDataResource(

- resource));

+ resource, ui::SCALE_FACTOR_NONE));

if (template_html.empty()) {

NOTREACHED() << "unable to load template. ID: " << resource;

« no previous file with comments | « chrome/browser/icon_loader_chromeos.cc ('k') | chrome/browser/plugin_finder.cc » ('j') | no next file with comments »