diff options
| author | luken <luken@chromium.org> | 2014-09-03 22:34:46 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-04 05:37:22 +0000 |
| commit | 862c1780c5b5c2df52f1b234d9c214cf6c25c4d1 (patch) | |
| tree | 4961124b7219c020829cc7e5022f4d3a05cab3a8 /win8 | |
| parent | 752f786be4d439120f79cbf036da54bb2604829f (diff) | |
| download | chromium_src-862c1780c5b5c2df52f1b234d9c214cf6c25c4d1.zip chromium_src-862c1780c5b5c2df52f1b234d9c214cf6c25c4d1.tar.gz chromium_src-862c1780c5b5c2df52f1b234d9c214cf6c25c4d1.tar.bz2 | |
Adds WARP support to Chromium on Windows 8+
Metro mode requires a GPU process but there are a few
tablets and other devices that don't have a GPU. Currently
we don't expose the menu option for Metro mode on these
devices. This CL exposes the Metro mode option for all
Windows 8+ machines, and if a GPU isn't normally available
it turns on WARP support for Metro mode only.
BUG=314954
Review URL: https://codereview.chromium.org/435383002
Cr-Commit-Position: refs/heads/master@{#293267}
Diffstat (limited to 'win8')
| -rw-r--r-- | win8/delegate_execute/command_execute_impl.cc | 4 | ||||
| -rw-r--r-- | win8/metro_driver/chrome_app_view_ash.cc | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/win8/delegate_execute/command_execute_impl.cc b/win8/delegate_execute/command_execute_impl.cc index b62319a..aea54f3 100644 --- a/win8/delegate_execute/command_execute_impl.cc +++ b/win8/delegate_execute/command_execute_impl.cc @@ -28,6 +28,7 @@ #include "chrome/installer/util/shell_util.h" #include "chrome/installer/util/util_constants.h" #include "ui/base/clipboard/clipboard_util_win.h" +#include "ui/base/ui_base_switches.h" #include "ui/gfx/win/dpi.h" #include "win8/delegate_execute/chrome_util.h" #include "win8/delegate_execute/delegate_execute_util.h" @@ -154,7 +155,8 @@ bool CommandExecuteImpl::path_provider_initialized_ = false; // c) If the activation returns E_APPLICATION_NOT_REGISTERED, then we fall // back to launching chrome on the desktop via LaunchDestopChrome(). Note // that this case can lead to strange behavior, because at this point we -// have pre-launched the browser with --silent-launch --viewer-connect. +// have pre-launched the browser with: +// --silent-launch --connect-to-metro-viewer. // E_APPLICATION_NOT_REGISTERED is always returned if Chrome is not the // default browser (this case will have already been checked for by // GetLaunchMode() and AHE_DESKTOP returned), but we don't know if it can diff --git a/win8/metro_driver/chrome_app_view_ash.cc b/win8/metro_driver/chrome_app_view_ash.cc index 98e52b3..8955b29 100644 --- a/win8/metro_driver/chrome_app_view_ash.cc +++ b/win8/metro_driver/chrome_app_view_ash.cc @@ -346,7 +346,7 @@ bool LaunchChromeBrowserProcess(const wchar_t* additional_parameters, if (!PathService::Get(base::FILE_EXE, &chrome_exe_path)) return false; - base::string16 parameters = L"--silent-launch --viewer-connect "; + base::string16 parameters = L"--silent-launch --connect-to-metro-viewer "; if (additional_parameters) parameters += additional_parameters; |