chrome/browser/chrome_browser_main_mac.mm - Issue 10151025: Add scale factor tag to data packs

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/chrome_browser_main_mac.mm

Issue 10151025: Add scale factor tag to data packs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 years, 8 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:

Index: chrome/browser/chrome_browser_main_mac.mm

diff --git a/chrome/browser/chrome_browser_main_mac.mm b/chrome/browser/chrome_browser_main_mac.mm

index c0ac4ac41fc10bc340ae7f7832c56d8ed038bf0c..cb09c855ec7b7aadbc5eb5cb9abbe767b596e991 100644

--- a/chrome/browser/chrome_browser_main_mac.mm

+++ b/chrome/browser/chrome_browser_main_mac.mm

@@ -25,6 +25,7 @@

#include "content/public/common/result_codes.h"

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

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

+#include "ui/base/resource/resource_handle.h"

void RecordBreakpadStatusUMA(MetricsService* metrics) {

metrics->RecordBreakpadRegistration(IsCrashReporterEnabled());

@@ -92,7 +93,8 @@ void ChromeBrowserMainPartsMac::PreMainMessageLoopStart() {

FilePath resources_pack_path;

PathService::Get(chrome::FILE_RESOURCES_PACK, &resources_pack_path);

- ResourceBundle::GetSharedInstance().AddDataPack(resources_pack_path);

+ ResourceBundle::GetSharedInstance().AddDataPack(

+ resources_pack_path, ui::ResourceHandle::kScaleFactor100x);

}

// This is a no-op if the KeystoneRegistration framework is not present.

« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | chrome/browser/themes/browser_theme_pack.cc » ('j') | no next file with comments »