diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-08-30 15:14:49 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-08-30 15:14:49 +0100 |
| commit | 424c4d7b64af9d0d8fd9624f381f469654d5e3d2 (patch) | |
| tree | af8b16dc2ba7fc8c8bb1c9fa18b907c847f3883d /win8 | |
| parent | c70ef2906f891fe7d218980660e4cda465717916 (diff) | |
| download | chromium_org-424c4d7b64af9d0d8fd9624f381f469654d5e3d2.tar.gz | |
Merge from Chromium at DEPS revision r220549
This commit was generated by merge_to_master.py.
Change-Id: I8fcb82db764ec1eb0294280936c177bd9ba8a9e9
Diffstat (limited to 'win8')
| -rw-r--r-- | win8/delegate_execute/command_execute_impl.cc | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/win8/delegate_execute/command_execute_impl.cc b/win8/delegate_execute/command_execute_impl.cc index 722f38cf0f..bfb1e517ba 100644 --- a/win8/delegate_execute/command_execute_impl.cc +++ b/win8/delegate_execute/command_execute_impl.cc @@ -535,7 +535,15 @@ EC_HOST_UI_MODE CommandExecuteImpl::GetLaunchMode() { } } - if (launch_mode >= ECHUIM_SYSTEM_LAUNCHER) { + // According to 'developing metro style enabled desktop browser' document + // ECHUIM_SYSTEM_LAUNCHER – Start menu launch (includes Tile activation, + // typing a URL into the search box in Start, etc.) + // In non aura world we apparently used ECHUIM_SYSTEM_LAUNCHER to mean + // launch on desktop. For Aura we are changing ECHUIM_SYSTEM to mean + // immersive mode. + if (launch_mode == ECHUIM_SYSTEM_LAUNCHER) + launch_mode = ECHUIM_IMMERSIVE; + else if (launch_mode > ECHUIM_SYSTEM_LAUNCHER) { // At the end if launch mode is not proper apply heuristics. launch_mode = base::win::IsTouchEnabledDevice() ? ECHUIM_IMMERSIVE : ECHUIM_DESKTOP; |