summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2013-07-09 11:24:06 +0200
committerSimon Hausmann <simon.hausmann@digia.com>2013-07-09 13:58:53 +0200
commitbd1794cedde9e4ac240ea6109840cbb2b1936af5 (patch)
treea1dbf78da3fdb2610caeaaa56382dc26f29877b7
parentac6ba5d4e2af478ae4793580603f8d9d0475e96d (diff)
Remove unneeded code from BrowserMainPartsQt
Remove code that would only be needed for content_browsertests that we do not require for now. Change-Id: I2cabbcfe63bcc0da838462eb97ab8c7eaf7289c7 Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
-rw-r--r--lib/content_browser_client_qt.cpp22
-rw-r--r--lib/content_browser_client_qt.h3
2 files changed, 4 insertions, 21 deletions
diff --git a/lib/content_browser_client_qt.cpp b/lib/content_browser_client_qt.cpp
index d0c5bddce..b94cf944d 100644
--- a/lib/content_browser_client_qt.cpp
+++ b/lib/content_browser_client_qt.cpp
@@ -151,10 +151,8 @@ base::MessagePump* messagePumpFactory()
class BrowserMainPartsQt : public content::BrowserMainParts
{
public:
- BrowserMainPartsQt(const content::MainFunctionParams& parameters)
+ BrowserMainPartsQt()
: content::BrowserMainParts()
- , m_parameters(parameters)
- , m_runMessageLoop(true)
{ }
void PreMainMessageLoopStart() Q_DECL_OVERRIDE
@@ -165,16 +163,6 @@ public:
void PreMainMessageLoopRun() Q_DECL_OVERRIDE
{
m_browserContext.reset(new BrowserContextQt());
-
- if (m_parameters.ui_task) {
- m_parameters.ui_task->Run();
- delete m_parameters.ui_task;
- m_runMessageLoop = false;
- }
- }
-
- bool MainMessageLoopRun(int* result_code) {
- return !m_runMessageLoop;
}
void PostMainMessageLoopRun()
@@ -195,10 +183,6 @@ public:
private:
scoped_ptr<BrowserContextQt> m_browserContext;
- // For running content_browsertests.
- const content::MainFunctionParams& m_parameters;
- bool m_runMessageLoop;
-
DISALLOW_COPY_AND_ASSIGN(BrowserMainPartsQt);
};
@@ -227,9 +211,9 @@ ContentBrowserClientQt *ContentBrowserClientQt::Get()
return gBrowserClient;
}
-content::BrowserMainParts *ContentBrowserClientQt::CreateBrowserMainParts(const content::MainFunctionParams &parameters)
+content::BrowserMainParts *ContentBrowserClientQt::CreateBrowserMainParts(const content::MainFunctionParams&)
{
- m_browserMainParts = new BrowserMainPartsQt(parameters);
+ m_browserMainParts = new BrowserMainPartsQt;
return m_browserMainParts;
}
diff --git a/lib/content_browser_client_qt.h b/lib/content_browser_client_qt.h
index 5ba9363db..5359d9b3a 100644
--- a/lib/content_browser_client_qt.h
+++ b/lib/content_browser_client_qt.h
@@ -52,7 +52,6 @@ class URLRequestContextGetter;
namespace content {
class BrowserContext;
class BrowserMainParts;
-class RenderProcessHost;
class RenderViewHostDelegateView;
class WebContentsViewPort;
class WebContents;
@@ -69,7 +68,7 @@ public:
~ContentBrowserClientQt();
static ContentBrowserClientQt* Get();
virtual content::WebContentsViewPort* OverrideCreateWebContentsView(content::WebContents* , content::RenderViewHostDelegateView**) Q_DECL_OVERRIDE;
- virtual content::BrowserMainParts* CreateBrowserMainParts(const content::MainFunctionParams& parameters) Q_DECL_OVERRIDE;
+ virtual content::BrowserMainParts* CreateBrowserMainParts(const content::MainFunctionParams&) Q_DECL_OVERRIDE;
BrowserContextQt* browser_context();