diff options
author | shrikant@chromium.org <shrikant@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-24 21:56:12 +0000 |
---|---|---|
committer | shrikant@chromium.org <shrikant@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-24 21:56:12 +0000 |
commit | bb481b101a826c7415c096466a8c1e749b9521f8 (patch) | |
tree | 5af84d67bcb1d2b39f9f6198108f9552ff767ede /win8 | |
parent | 6fbda3b95694c64543e5e15594465031c27a367e (diff) | |
download | chromium_src-bb481b101a826c7415c096466a8c1e749b9521f8.zip chromium_src-bb481b101a826c7415c096466a8c1e749b9521f8.tar.gz chromium_src-bb481b101a826c7415c096466a8c1e749b9521f8.tar.bz2 |
IsMachineATablet is now modified to check only for touch capability and hence name change as well.
Also added minor modification of checking viewer connection process for immersive mode.
BUG=223778
TEST=none
Review URL: https://chromiumcodereview.appspot.com/14061007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@196242 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'win8')
-rw-r--r-- | win8/delegate_execute/command_execute_impl.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/win8/delegate_execute/command_execute_impl.cc b/win8/delegate_execute/command_execute_impl.cc index 30faf16..e95cfbc 100644 --- a/win8/delegate_execute/command_execute_impl.cc +++ b/win8/delegate_execute/command_execute_impl.cc @@ -134,7 +134,7 @@ bool CommandExecuteImpl::path_provider_initialized_ = false; // c) else we return what GetLaunchMode() tells us, which is: // i) if the command line --force-xxx is present return that // ii) if the registry 'launch_mode' exists return that -// iii) if IsMachineATablet() is true return AHE_IMMERSIVE +// iii) if IsTouchEnabledDevice() is true return AHE_IMMERSIVE // iv) else return AHE_DESKTOP // 6- If we returned AHE_IMMERSIVE in step 5 windows might not call us back // and simply activate chrome in metro by itself, however in some cases @@ -154,7 +154,7 @@ bool CommandExecuteImpl::path_provider_initialized_ = false; // in the registry so next time the logic reaches 5c-ii it will use the same // mode again. // -// Also note that if we are not the default browser and IsMachineATablet() +// Also note that if we are not the default browser and IsTouchEnabledDevice() // returns true, launching chrome can go all the way to 7c, which might be // a slow way to start chrome. // @@ -540,7 +540,7 @@ EC_HOST_UI_MODE CommandExecuteImpl::GetLaunchMode() { DWORD reg_value; if (reg_key.ReadValueDW(chrome::kLaunchModeValue, ®_value) != ERROR_SUCCESS) { - launch_mode = base::win::IsMachineATablet() ? + launch_mode = base::win::IsTouchEnabledDevice() ? ECHUIM_IMMERSIVE : ECHUIM_DESKTOP; AtlTrace("Launch mode forced by heuristics to %s\n", modes[launch_mode]); } else if (reg_value >= ECHUIM_SYSTEM_LAUNCHER) { |