mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium revision cb947c01 (#352221)
- Implement CefRequestHandler::OnBeforeBrowse using NavigationThrottle instead of ResourceThrottle (see http://crbug.com/537634). The CefRequest object passed to OnBeforeBrowse will no longer have an associated request identifier. - Mac: Remove additional helper apps which are no longer required (see http://crbug.com/520680) - Remove the UR_FLAG_REPORT_RAW_HEADERS flag which is no longer supported (see http://crbug.com/517114) - Remove the CefBrowserSettings.java parameter. Java is an NPAPI plugin and NPAPI plugins are no longer supported (see http://crbug.com/470301#c11) - Add CefFormatUrlForSecurityDisplay function in cef_parser.h - Fix crash when passing `--disable-extensions` command-line flag (issue #1721) - Linux: Fix NSS handler loading (issue #1727)
This commit is contained in:
@ -1,5 +1,5 @@
|
||||
diff --git spellcheck_factory.cc spellcheck_factory.cc
|
||||
index 4c61d34..9e4f3d1 100644
|
||||
index fcf2ce8..9e4f3d1 100644
|
||||
--- spellcheck_factory.cc
|
||||
+++ spellcheck_factory.cc
|
||||
@@ -16,6 +16,13 @@
|
||||
@ -20,13 +20,13 @@ index 4c61d34..9e4f3d1 100644
|
||||
|
||||
// static
|
||||
SpellcheckServiceFactory* SpellcheckServiceFactory::GetInstance() {
|
||||
- return Singleton<SpellcheckServiceFactory>::get();
|
||||
- return base::Singleton<SpellcheckServiceFactory>::get();
|
||||
+ return g_spellcheck_service_factory.Pointer();
|
||||
}
|
||||
|
||||
SpellcheckServiceFactory::SpellcheckServiceFactory()
|
||||
diff --git spellcheck_factory.h spellcheck_factory.h
|
||||
index 3e4ad0e..d52b881 100644
|
||||
index 7cdf471..d52b881 100644
|
||||
--- spellcheck_factory.h
|
||||
+++ spellcheck_factory.h
|
||||
@@ -7,7 +7,7 @@
|
||||
@ -42,7 +42,7 @@ index 3e4ad0e..d52b881 100644
|
||||
static SpellcheckServiceFactory* GetInstance();
|
||||
|
||||
private:
|
||||
- friend struct DefaultSingletonTraits<SpellcheckServiceFactory>;
|
||||
- friend struct base::DefaultSingletonTraits<SpellcheckServiceFactory>;
|
||||
+ friend struct base::DefaultLazyInstanceTraits<SpellcheckServiceFactory>;
|
||||
|
||||
SpellcheckServiceFactory();
|
||||
|
Reference in New Issue
Block a user