From 4450f626236551f0bcba59b5f711abf7e4768ec8 Mon Sep 17 00:00:00 2001 From: "hajimehoshi@chromium.org" Date: Thu, 6 Feb 2014 04:40:26 +0000 Subject: Revert 249248 "Revert 248332 " > Revert 248332 > > This applies > https://codereview.chromium.org/142473002 > > Which got initially commited as > https://src.chromium.org/viewvc/chrome?view=rev&revision=247151 > > > > Revert 248331 "Revert 247156 "Revert 247151 "Cleanup of windows ..." > > > > Basically reverting 247151 which still breaks the tree. > > > > > > > Revert 247156 "Revert 247151 "Cleanup of windows launch code"" > > > > > > This re-enables 247151 because I can't repro it > > > so it is possible it was a temporary NaCL insanity and definitely > > > the x64 breakage was a flake as confirmed by try jobs. > > > > > > > > > > Revert 247151 "Cleanup of windows launch code" > > > > > > > > > Cleanup of windows launch code > > > > > > > > > > The windows startup code was handling aura and non-aura cases which > > > > > require different startup logic in metro (immersive mode). Since we > > > > > don't support the non-Aura logic we can get rid of a lot of code. > > > > > > > > > > Tbring gab for the installer constant addition. > > > > > > > > > > R=ananta@chromium.org, scottmg@chromium.org > > > > > TBR=gab > > > > > BUG=none > > > > > > > > > > Review URL: https://codereview.chromium.org/142473002 > > > > > > > > TBR=cpu@chromium.org > > > > > > > > Review URL: https://codereview.chromium.org/140123006 > > > > > > TBR=cpu@chromium.org > > > > > > Review URL: https://codereview.chromium.org/151683004 > > > > TBR=cpu@chromium.org > > > > Review URL: https://codereview.chromium.org/152033002 > > TBR=cpu@chromium.org > > Review URL: https://codereview.chromium.org/143473007 TBR=cpu@chromium.org Review URL: https://codereview.chromium.org/140383004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249271 0039d316-1c4b-4281-b951-d872f2087c98 --- win8/metro_driver/chrome_app_view_ash.cc | 4 +++- win8/metro_driver/metro_driver.cc | 9 +++++++-- win8/metro_driver/metro_driver.h | 4 +++- 3 files changed, 13 insertions(+), 4 deletions(-) (limited to 'win8') 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 core_app(icore_app); mswr::ComPtr 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(core_app.Get()); + auto view_factory = mswr::Make( + 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 { 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); }; -- cgit v1.1