Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(138)

Unified Diff: win8/delegate_execute/command_execute_impl.cc

Issue 1581473002: Remove base/win/metro.{cc|h} and some associated code (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fixes Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: win8/delegate_execute/command_execute_impl.cc
diff --git a/win8/delegate_execute/command_execute_impl.cc b/win8/delegate_execute/command_execute_impl.cc
index 73f66cf499f5c403664a8d1cbf9a1606912d9d05..236f86271560ff1c1cf3da0e2a8ada3a628aed65 100644
--- a/win8/delegate_execute/command_execute_impl.cc
+++ b/win8/delegate_execute/command_execute_impl.cc
@@ -14,7 +14,6 @@
#include "base/path_service.h"
#include "base/process/launch.h"
#include "base/strings/utf_string_conversions.h"
-#include "base/win/metro.h"
#include "base/win/registry.h"
#include "base/win/scoped_co_mem.h"
#include "base/win/scoped_handle.h"
@@ -487,26 +486,7 @@ EC_HOST_UI_MODE CommandExecuteImpl::GetLaunchMode() {
return launch_mode;
}
- if (!base::win::IsChromeMetroSupported()) {
- launch_mode = ECHUIM_DESKTOP;
- launch_mode_determined = true;
- return launch_mode;
- }
-
- // Use the previous mode if available. Else launch in desktop mode.
- DWORD reg_value;
- if (reg_key.ReadValueDW(chrome::kLaunchModeValue,
gab 2016/01/12 21:11:04 Please add cleanup code to delete this value inste
scottmg 2016/01/13 20:48:16 Do we normally do this? How long should we keep th
gab 2016/01/14 03:10:27 Yes. We do this all over the installer and in chro
gab 2016/01/14 03:12:24 Err... >= 4.5 months (18 weeks) on Stable
- &reg_value) != ERROR_SUCCESS) {
- launch_mode = ECHUIM_DESKTOP;
- AtlTrace("Can't read registry, defaulting to %s\n", modes[launch_mode]);
- } else if (reg_value >= ECHUIM_SYSTEM_LAUNCHER) {
- AtlTrace("Invalid registry launch mode value %u\n", reg_value);
- launch_mode = ECHUIM_DESKTOP;
- } else {
- launch_mode = static_cast<EC_HOST_UI_MODE>(reg_value);
- AtlTrace("Launch mode forced by registry to %s\n", modes[launch_mode]);
- }
-
+ launch_mode = ECHUIM_DESKTOP;
launch_mode_determined = true;
return launch_mode;
}

Powered by Google App Engine
This is Rietveld 408576698