mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2024-12-12 01:26:03 +01:00
c7ea0c5958
- Mac: 10.13 is now the minimum required macOS version
30 lines
1.2 KiB
Diff
30 lines
1.2 KiB
Diff
diff --git content/public/browser/web_ui_controller_factory.h content/public/browser/web_ui_controller_factory.h
|
|
index eb068fb9bb42c..4e8e6a1a7abf4 100644
|
|
--- content/public/browser/web_ui_controller_factory.h
|
|
+++ content/public/browser/web_ui_controller_factory.h
|
|
@@ -47,9 +47,6 @@ class CONTENT_EXPORT WebUIControllerFactory {
|
|
virtual bool UseWebUIForURL(BrowserContext* browser_context,
|
|
const GURL& url) = 0;
|
|
|
|
- private:
|
|
- friend class ScopedWebUIControllerFactoryRegistration;
|
|
-
|
|
static void UnregisterFactoryForTesting(WebUIControllerFactory* factory);
|
|
};
|
|
|
|
diff --git content/public/browser/webui_config_map.h content/public/browser/webui_config_map.h
|
|
index af6c1a5845697..ac003cce0f40c 100644
|
|
--- content/public/browser/webui_config_map.h
|
|
+++ content/public/browser/webui_config_map.h
|
|
@@ -60,6 +60,10 @@ class CONTENT_EXPORT WebUIConfigMap {
|
|
// Returns the size of the map, i.e. how many WebUIConfigs are registered.
|
|
size_t GetSizeForTesting() { return configs_map_.size(); }
|
|
|
|
+ WebUIControllerFactory* controller_factory() const {
|
|
+ return webui_controller_factory_.get();
|
|
+ }
|
|
+
|
|
private:
|
|
void AddWebUIConfigImpl(std::unique_ptr<WebUIConfig> config);
|
|
|