diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-06 02:54:54 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-06 02:54:54 +0000 |
| commit | d8564fbf8435e12f755a93a51b43a9fc608c9a73 (patch) | |
| tree | 8e476865733bb8f1fea1ddc99569917b8f131cf3 /win8/metro_driver/chrome_app_view_ash.cc | |
| parent | 730c17083cb64c4215bd939f4c916a87b47ebe6e (diff) | |
| download | chromium_src-d8564fbf8435e12f755a93a51b43a9fc608c9a73.zip chromium_src-d8564fbf8435e12f755a93a51b43a9fc608c9a73.tar.gz chromium_src-d8564fbf8435e12f755a93a51b43a9fc608c9a73.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@249248 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8/metro_driver/chrome_app_view_ash.cc')
| -rw-r--r-- | win8/metro_driver/chrome_app_view_ash.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/win8/metro_driver/chrome_app_view_ash.cc b/win8/metro_driver/chrome_app_view_ash.cc index b8f2241..518d1d9 100644 --- a/win8/metro_driver/chrome_app_view_ash.cc +++ b/win8/metro_driver/chrome_app_view_ash.cc @@ -1328,9 +1328,7 @@ HRESULT ChromeAppViewAsh::OnSizeChanged(winui::Core::ICoreWindow* sender, /////////////////////////////////////////////////////////////////////////////// ChromeAppViewFactory::ChromeAppViewFactory( - winapp::Core::ICoreApplication* icore_app, - LPTHREAD_START_ROUTINE host_main, - void* host_context) { + winapp::Core::ICoreApplication* icore_app) { mswr::ComPtr<winapp::Core::ICoreApplication> core_app(icore_app); mswr::ComPtr<winapp::Core::ICoreApplicationExit> app_exit; CheckHR(core_app.As(&app_exit)); |