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 // Implementation of the CommandExecuteImpl class which implements the | 4 // Implementation of the CommandExecuteImpl class which implements the |
5 // IExecuteCommand and related interfaces for handling ShellExecute based | 5 // IExecuteCommand and related interfaces for handling ShellExecute based |
6 // launches of the Chrome browser. | 6 // launches of the Chrome browser. |
7 | 7 |
8 #include "win8/delegate_execute/command_execute_impl.h" | 8 #include "win8/delegate_execute/command_execute_impl.h" |
9 | 9 |
10 #include <shlguid.h> | 10 #include <shlguid.h> |
(...skipping 529 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
540 DWORD reg_value; | 540 DWORD reg_value; |
541 if (reg_key.ReadValueDW(chrome::kLaunchModeValue, | 541 if (reg_key.ReadValueDW(chrome::kLaunchModeValue, |
542 ®_value) != ERROR_SUCCESS) { | 542 ®_value) != ERROR_SUCCESS) { |
543 launch_mode = base::win::IsMachineATablet() ? | 543 launch_mode = base::win::IsMachineATablet() ? |
544 ECHUIM_IMMERSIVE : ECHUIM_DESKTOP; | 544 ECHUIM_IMMERSIVE : ECHUIM_DESKTOP; |
545 AtlTrace("Launch mode forced by heuristics to %s\n", modes[launch_mode]); | 545 AtlTrace("Launch mode forced by heuristics to %s\n", modes[launch_mode]); |
546 } else if (reg_value >= ECHUIM_SYSTEM_LAUNCHER) { | 546 } else if (reg_value >= ECHUIM_SYSTEM_LAUNCHER) { |
547 AtlTrace("Invalid registry launch mode value %u\n", reg_value); | 547 AtlTrace("Invalid registry launch mode value %u\n", reg_value); |
548 launch_mode = ECHUIM_DESKTOP; | 548 launch_mode = ECHUIM_DESKTOP; |
549 } else { | 549 } else { |
| 550 launch_mode = static_cast<EC_HOST_UI_MODE>(reg_value); |
550 AtlTrace("Launch mode forced by registry to %s\n", modes[launch_mode]); | 551 AtlTrace("Launch mode forced by registry to %s\n", modes[launch_mode]); |
551 launch_mode = static_cast<EC_HOST_UI_MODE>(reg_value); | |
552 } | 552 } |
553 | 553 |
554 launch_mode_determined = true; | 554 launch_mode_determined = true; |
555 return launch_mode; | 555 return launch_mode; |
556 } | 556 } |
OLD | NEW |