| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "win8/metro_driver/stdafx.h" | 5 #include "win8/metro_driver/stdafx.h" |
| 6 #include "win8/metro_driver/chrome_app_view_ash.h" | 6 #include "win8/metro_driver/chrome_app_view_ash.h" |
| 7 | 7 |
| 8 #include <corewindow.h> | 8 #include <corewindow.h> |
| 9 #include <shellapi.h> | 9 #include <shellapi.h> |
| 10 #include <windows.foundation.h> | 10 #include <windows.foundation.h> |
| (...skipping 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 339 } | 339 } |
| 340 } | 340 } |
| 341 } | 341 } |
| 342 | 342 |
| 343 DVLOG(1) << "Launching chrome server"; | 343 DVLOG(1) << "Launching chrome server"; |
| 344 base::FilePath chrome_exe_path; | 344 base::FilePath chrome_exe_path; |
| 345 | 345 |
| 346 if (!PathService::Get(base::FILE_EXE, &chrome_exe_path)) | 346 if (!PathService::Get(base::FILE_EXE, &chrome_exe_path)) |
| 347 return false; | 347 return false; |
| 348 | 348 |
| 349 base::string16 parameters = L"--silent-launch --viewer-connect "; | 349 base::string16 parameters = L"--silent-launch --connect-to-metro-viewer "; |
| 350 if (additional_parameters) | 350 if (additional_parameters) |
| 351 parameters += additional_parameters; | 351 parameters += additional_parameters; |
| 352 | 352 |
| 353 SHELLEXECUTEINFO sei = { sizeof(sei) }; | 353 SHELLEXECUTEINFO sei = { sizeof(sei) }; |
| 354 sei.nShow = SW_SHOWNORMAL; | 354 sei.nShow = SW_SHOWNORMAL; |
| 355 sei.lpFile = chrome_exe_path.value().c_str(); | 355 sei.lpFile = chrome_exe_path.value().c_str(); |
| 356 sei.lpDirectory = L""; | 356 sei.lpDirectory = L""; |
| 357 sei.lpParameters = parameters.c_str(); | 357 sei.lpParameters = parameters.c_str(); |
| 358 ::ShellExecuteEx(&sei); | 358 ::ShellExecuteEx(&sei); |
| 359 return true; | 359 return true; |
| (...skipping 1030 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1390 mswr::ComPtr<winapp::Core::ICoreApplicationExit> app_exit; | 1390 mswr::ComPtr<winapp::Core::ICoreApplicationExit> app_exit; |
| 1391 CheckHR(core_app.As(&app_exit)); | 1391 CheckHR(core_app.As(&app_exit)); |
| 1392 globals.app_exit = app_exit.Detach(); | 1392 globals.app_exit = app_exit.Detach(); |
| 1393 } | 1393 } |
| 1394 | 1394 |
| 1395 IFACEMETHODIMP | 1395 IFACEMETHODIMP |
| 1396 ChromeAppViewFactory::CreateView(winapp::Core::IFrameworkView** view) { | 1396 ChromeAppViewFactory::CreateView(winapp::Core::IFrameworkView** view) { |
| 1397 *view = mswr::Make<ChromeAppViewAsh>().Detach(); | 1397 *view = mswr::Make<ChromeAppViewAsh>().Detach(); |
| 1398 return (*view) ? S_OK : E_OUTOFMEMORY; | 1398 return (*view) ? S_OK : E_OUTOFMEMORY; |
| 1399 } | 1399 } |
| OLD | NEW |