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

Unified Diff: chrome/browser/chrome_browser_main_mac.mm

Issue 1585013002: MacViews: Use Cocoa folder icons in tree views. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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/chrome_browser_main_mac.mm
diff --git a/chrome/browser/chrome_browser_main_mac.mm b/chrome/browser/chrome_browser_main_mac.mm
index 4b8d76b269a6252cdd03e4704c27e214feb7f514..402793126143d6117d530fea64f86dfe16d98b5b 100644
--- a/chrome/browser/chrome_browser_main_mac.mm
+++ b/chrome/browser/chrome_browser_main_mac.mm
@@ -107,9 +107,11 @@ void ChromeBrowserMainPartsMac::PreMainMessageLoopStart() {
// have the strings avaiable for localization.
// TODO(markusheintz): Read preference pref::kApplicationLocale in order
// to enforce the application locale.
+ resource_delegate_.reset(new ui::MacResourceDelegate());
const std::string loaded_locale =
ui::ResourceBundle::InitSharedInstanceWithLocale(
- std::string(), NULL, ui::ResourceBundle::LOAD_COMMON_RESOURCES);
+ std::string(), resource_delegate_.get(),
+ ui::ResourceBundle::LOAD_COMMON_RESOURCES);
CHECK(!loaded_locale.empty()) << "Default locale could not be found";
base::FilePath resources_pack_path;

Powered by Google App Engine
This is Rietveld 408576698