Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / browser / webui / web_ui_controller_factory_registry.h

diff --git a/src/content/browser/webui/web_ui_controller_factory_registry.h b/src/content/browser/webui/web_ui_controller_factory_registry.h
index c2dd9bb..b59162f 100644 (file)
--- a/src/content/browser/webui/web_ui_controller_factory_registry.h
+++ b/src/content/browser/webui/web_ui_controller_factory_registry.h
@@ -19,27 +19,26 @@ class CONTENT_EXPORT WebUIControllerFactoryRegistry
 
   // WebUIControllerFactory implementation. Each method loops through the same
   // method on all the factories.
-  virtual WebUIController* CreateWebUIControllerForURL(
-      WebUI* web_ui, const GURL& url) const OVERRIDE;
-  virtual WebUI::TypeID GetWebUIType(BrowserContext* browser_context,
-                                     const GURL& url) const OVERRIDE;
-  virtual bool UseWebUIForURL(BrowserContext* browser_context,
-                              const GURL& url) const OVERRIDE;
-  virtual bool UseWebUIBindingsForURL(BrowserContext* browser_context,
-                                      const GURL& url) const OVERRIDE;
+  WebUIController* CreateWebUIControllerForURL(WebUI* web_ui,
+                                               const GURL& url) const override;
+  WebUI::TypeID GetWebUIType(BrowserContext* browser_context,
+                             const GURL& url) const override;
+  bool UseWebUIForURL(BrowserContext* browser_context,
+                      const GURL& url) const override;
+  bool UseWebUIBindingsForURL(BrowserContext* browser_context,
+                              const GURL& url) const override;
 
   // Returns true if the given URL can be loaded by Web UI system. This allows
   // URLs that UseWebUIForURL returns true for, and also URLs that can be loaded
   // by normal tabs such as javascript: URLs or about:hang.
   bool IsURLAcceptableForWebUI(BrowserContext* browser_context,
-                               const GURL& url,
-                               bool data_urls_allowed) const;
+                               const GURL& url) const;
 
  private:
   friend struct DefaultSingletonTraits<WebUIControllerFactoryRegistry>;
 
   WebUIControllerFactoryRegistry();
-  virtual ~WebUIControllerFactoryRegistry();
+  ~WebUIControllerFactoryRegistry() override;
 
   DISALLOW_COPY_AND_ASSIGN(WebUIControllerFactoryRegistry);
 };