summaryrefslogtreecommitdiffstats
path: root/win8/metro_driver
diff options
context:
space:
mode:
Diffstat (limited to 'win8/metro_driver')
-rw-r--r--win8/metro_driver/chrome_app_view_ash.cc4
-rw-r--r--win8/metro_driver/metro_driver.cc9
-rw-r--r--win8/metro_driver/metro_driver.h4
3 files changed, 13 insertions, 4 deletions
diff --git a/win8/metro_driver/chrome_app_view_ash.cc b/win8/metro_driver/chrome_app_view_ash.cc
index 518d1d9..b8f2241 100644
--- a/win8/metro_driver/chrome_app_view_ash.cc
+++ b/win8/metro_driver/chrome_app_view_ash.cc
@@ -1328,7 +1328,9 @@ HRESULT ChromeAppViewAsh::OnSizeChanged(winui::Core::ICoreWindow* sender,
///////////////////////////////////////////////////////////////////////////////
ChromeAppViewFactory::ChromeAppViewFactory(
- winapp::Core::ICoreApplication* icore_app) {
+ winapp::Core::ICoreApplication* icore_app,
+ LPTHREAD_START_ROUTINE host_main,
+ void* host_context) {
mswr::ComPtr<winapp::Core::ICoreApplication> core_app(icore_app);
mswr::ComPtr<winapp::Core::ICoreApplicationExit> app_exit;
CheckHR(core_app.As(&app_exit));
diff --git a/win8/metro_driver/metro_driver.cc b/win8/metro_driver/metro_driver.cc
index eb87754..846a71f 100644
--- a/win8/metro_driver/metro_driver.cc
+++ b/win8/metro_driver/metro_driver.cc
@@ -15,6 +15,10 @@
#include "base/win/scoped_comptr.h"
#include "win8/metro_driver/winrt_utils.h"
+#if !defined(USE_AURA)
+#include "win8/metro_driver/chrome_app_view.h"
+#endif
+
// TODO(siggi): Move this to GYP.
#pragma comment(lib, "runtimeobject.lib")
@@ -55,7 +59,7 @@ base::AtExitManager at_exit;
#endif
extern "C" __declspec(dllexport)
-int InitMetro() {
+int InitMetro(LPTHREAD_START_ROUTINE thread_proc, void* context) {
// Initialize the command line.
CommandLine::Init(0, NULL);
logging::LoggingSettings settings;
@@ -93,7 +97,8 @@ int InitMetro() {
if (FAILED(hr))
return 1;
- auto view_factory = mswr::Make<ChromeAppViewFactory>(core_app.Get());
+ auto view_factory = mswr::Make<ChromeAppViewFactory>(
+ core_app.Get(), thread_proc, context);
hr = core_app->Run(view_factory.Get());
DVLOG(1) << "exiting InitMetro, hr=" << hr;
diff --git a/win8/metro_driver/metro_driver.h b/win8/metro_driver/metro_driver.h
index 2b7d548..c4ea2ab 100644
--- a/win8/metro_driver/metro_driver.h
+++ b/win8/metro_driver/metro_driver.h
@@ -10,7 +10,9 @@
class ChromeAppViewFactory
: public mswr::RuntimeClass<winapp::Core::IFrameworkViewSource> {
public:
- ChromeAppViewFactory(winapp::Core::ICoreApplication* icore_app);
+ ChromeAppViewFactory(winapp::Core::ICoreApplication* icore_app,
+ LPTHREAD_START_ROUTINE host_main,
+ void* host_context);
IFACEMETHOD(CreateView)(winapp::Core::IFrameworkView** view);
};