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

Unified Diff: ui/views_content_client/views_content_main_delegate.cc

Issue 297143009: MacViews: Gets views_examples_with_content_exe compiling on Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase to master Created 6 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 | « ui/views_content_client/views_content_client_main_parts_mac.mm ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views_content_client/views_content_main_delegate.cc
diff --git a/ui/views_content_client/views_content_main_delegate.cc b/ui/views_content_client/views_content_main_delegate.cc
index a97c812472e3b52955b97164c08cbb69756c7361..1fb3a6913e1c4eebe1b2ebe76ca609b8f237714c 100644
--- a/ui/views_content_client/views_content_main_delegate.cc
+++ b/ui/views_content_client/views_content_main_delegate.cc
@@ -61,6 +61,13 @@ void ViewsContentMainDelegate::PreSandboxStartup() {
base::FilePath ui_test_pak_path;
DCHECK(PathService::Get(ui::UI_TEST_PAK, &ui_test_pak_path));
ui::ResourceBundle::InitSharedInstanceWithPakPath(ui_test_pak_path);
+
+ // Load content resources to provide, e.g., sandbox configuration data on Mac.
+ base::FilePath content_resources_pak_path;
+ PathService::Get(base::DIR_MODULE, &content_resources_pak_path);
+ ui::ResourceBundle::GetSharedInstance().AddDataPackFromPath(
+ content_resources_pak_path.AppendASCII("content_resources.pak"),
+ ui::SCALE_FACTOR_100P);
}
content::ContentBrowserClient*
« no previous file with comments | « ui/views_content_client/views_content_client_main_parts_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698