mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
9017c0e74e
- Mac: Fix path discovery for non-native frameworks (issue #576). - Avoid loading Chrome-specific pack files (issue #578). - Make DevTools remote debugging URLs harder to guess (issue #583) - Add CefBrowser::GetDevToolsURL() method (issue #583). - Add DevTools example to cefclient (must run with --remote-debugging-port=XXXX command-line flag) (issue #583). git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@608 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
Index: resource_bundle.cc
|
|
===================================================================
|
|
--- resource_bundle.cc (revision 133962)
|
|
+++ resource_bundle.cc (working copy)
|
|
@@ -47,6 +47,15 @@
|
|
ResourceBundle* ResourceBundle::g_shared_instance_ = NULL;
|
|
|
|
// static
|
|
+std::string ResourceBundle::InitSharedInstanceWithLocaleCef(
|
|
+ const std::string& pref_locale) {
|
|
+ DCHECK(g_shared_instance_ == NULL) << "ResourceBundle initialized twice";
|
|
+ g_shared_instance_ = new ResourceBundle();
|
|
+
|
|
+ return g_shared_instance_->LoadLocaleResources(pref_locale);
|
|
+}
|
|
+
|
|
+// static
|
|
std::string ResourceBundle::InitSharedInstanceWithLocale(
|
|
const std::string& pref_locale) {
|
|
DCHECK(g_shared_instance_ == NULL) << "ResourceBundle initialized twice";
|
|
Index: resource_bundle.h
|
|
===================================================================
|
|
--- resource_bundle.h (revision 133962)
|
|
+++ resource_bundle.h (working copy)
|
|
@@ -63,6 +63,10 @@
|
|
RTL_DISABLED,
|
|
};
|
|
|
|
+ // Initialize the ResourceBundle without loading any Chrome pack files.
|
|
+ static std::string InitSharedInstanceWithLocaleCef(
|
|
+ const std::string& pref_locale);
|
|
+
|
|
// Initialize the ResourceBundle for this process. Returns the language
|
|
// selected.
|
|
// NOTE: Mac ignores this and always loads up resources for the language
|