diff options
| author | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 04:05:25 +0000 |
|---|---|---|
| committer | cpu@chromium.org <cpu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-27 04:05:25 +0000 |
| commit | 54c6efa65afd6484f304ed01786865e84bb11b1b (patch) | |
| tree | f76555ba859355f299f1a237a4aa3e45a79cb4e3 /win8 | |
| parent | 398273b1dd2c6f93a1a21fa6a9d8e5c5479864d7 (diff) | |
| download | chromium_src-54c6efa65afd6484f304ed01786865e84bb11b1b.zip chromium_src-54c6efa65afd6484f304ed01786865e84bb11b1b.tar.gz chromium_src-54c6efa65afd6484f304ed01786865e84bb11b1b.tar.bz2 | |
Cleanup of windows launch code
This is a redo of
https://codereview.chromium.org/142473002/
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.
TBR=gab
BUG=none
Review URL: https://codereview.chromium.org/158403002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253709 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, 4 insertions, 13 deletions
diff --git a/win8/metro_driver/chrome_app_view_ash.cc b/win8/metro_driver/chrome_app_view_ash.cc index af63093..1479a7c 100644 --- a/win8/metro_driver/chrome_app_view_ash.cc +++ b/win8/metro_driver/chrome_app_view_ash.cc @@ -1331,9 +1331,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)); diff --git a/win8/metro_driver/metro_driver.cc b/win8/metro_driver/metro_driver.cc index 846a71f..eb87754 100644 --- a/win8/metro_driver/metro_driver.cc +++ b/win8/metro_driver/metro_driver.cc @@ -15,10 +15,6 @@ #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") @@ -59,7 +55,7 @@ base::AtExitManager at_exit; #endif extern "C" __declspec(dllexport) -int InitMetro(LPTHREAD_START_ROUTINE thread_proc, void* context) { +int InitMetro() { // Initialize the command line. CommandLine::Init(0, NULL); logging::LoggingSettings settings; @@ -97,8 +93,7 @@ int InitMetro(LPTHREAD_START_ROUTINE thread_proc, void* context) { if (FAILED(hr)) return 1; - auto view_factory = mswr::Make<ChromeAppViewFactory>( - core_app.Get(), thread_proc, context); + auto view_factory = mswr::Make<ChromeAppViewFactory>(core_app.Get()); 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 c4ea2ab..2b7d548 100644 --- a/win8/metro_driver/metro_driver.h +++ b/win8/metro_driver/metro_driver.h @@ -10,9 +10,7 @@ class ChromeAppViewFactory : public mswr::RuntimeClass<winapp::Core::IFrameworkViewSource> { public: - ChromeAppViewFactory(winapp::Core::ICoreApplication* icore_app, - LPTHREAD_START_ROUTINE host_main, - void* host_context); + ChromeAppViewFactory(winapp::Core::ICoreApplication* icore_app); IFACEMETHOD(CreateView)(winapp::Core::IFrameworkView** view); }; |