diff options
| author | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-04-23 17:56:57 +0200 |
|---|---|---|
| committer | Andras Becsi <andras.becsi@theqtcompany.com> | 2015-04-23 17:57:59 +0200 |
| commit | bb2e06f828c2169f6853a7e8fd29b138bb469fe3 (patch) | |
| tree | 79ec99f41ccce75bc8b8fa11a25365b502fe520e /src/core/content_browser_client_qt.h | |
| parent | 2ba0e25a0c6fee7e2144f1fc8b577f73e1155e6d (diff) | |
| parent | a626e0e3ff1ab160855c7deee283d8eb004d47ce (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: I6f913ebc7aed68d4b8c3f8666fd2389607b491b7
Diffstat (limited to 'src/core/content_browser_client_qt.h')
| -rw-r--r-- | src/core/content_browser_client_qt.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/core/content_browser_client_qt.h b/src/core/content_browser_client_qt.h index 84c559c5d..141c82a8f 100644 --- a/src/core/content_browser_client_qt.h +++ b/src/core/content_browser_client_qt.h @@ -119,6 +119,7 @@ public: virtual blink::WebNotificationPermission CheckDesktopNotificationPermission(const GURL& source_origin, content::ResourceContext* context, int render_process_id) Q_DECL_OVERRIDE; virtual std::string GetApplicationLocale() Q_DECL_OVERRIDE; + virtual void AppendExtraCommandLineSwitches(base::CommandLine* command_line, int child_process_id) Q_DECL_OVERRIDE; #if defined(ENABLE_PLUGINS) virtual void DidCreatePpapiPlugin(content::BrowserPpapiHost* browser_host) Q_DECL_OVERRIDE; |