diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-25 23:49:16 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-25 23:49:16 +0000 |
| commit | 57d83182d3280f27f57daa5c1778f1fdf1fbfaee (patch) | |
| tree | c63a7aa4c6995b70b0a07dcf13f4b65937f81de8 /win8 | |
| parent | bf226999cde8c97a64ba6ac39641b46e10b4fc3e (diff) | |
| download | chromium_src-57d83182d3280f27f57daa5c1778f1fdf1fbfaee.zip chromium_src-57d83182d3280f27f57daa5c1778f1fdf1fbfaee.tar.gz chromium_src-57d83182d3280f27f57daa5c1778f1fdf1fbfaee.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247156 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8')
| -rw-r--r-- | win8/metro_driver/chrome_app_view_ash.cc | 4 | ||||
| -rw-r--r-- | win8/metro_driver/metro_driver.cc | 9 | ||||
| -rw-r--r-- | win8/metro_driver/metro_driver.h | 4 |
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); }; |