diff options
author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-01 04:52:17 +0000 |
---|---|---|
committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-01 04:52:17 +0000 |
commit | e5ab799c647a5fa26ccb5f55352fdce7e39cfded (patch) | |
tree | 8189cd34cb9064fe691fbb1f25f6f6899f117583 /win8/metro_driver/metro_driver.h | |
parent | 496700a7f47063baf51e28b18aa6cc191892f60b (diff) | |
download | chromium_src-e5ab799c647a5fa26ccb5f55352fdce7e39cfded.zip chromium_src-e5ab799c647a5fa26ccb5f55352fdce7e39cfded.tar.gz chromium_src-e5ab799c647a5fa26ccb5f55352fdce7e39cfded.tar.bz2 |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248332 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8/metro_driver/metro_driver.h')
-rw-r--r-- | win8/metro_driver/metro_driver.h | 4 |
1 files changed, 3 insertions, 1 deletions
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); }; |