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

Unified Diff: chrome/browser/chrome_browser_main_win.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: chrome/browser/chrome_browser_main_win.cc
diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc
index 139d8b90d6f0ce215da3fe570a7383acdc6514dc..4e4706e98eec45dc629e0c8ef301e268fc0c930e 100644
--- a/chrome/browser/chrome_browser_main_win.cc
+++ b/chrome/browser/chrome_browser_main_win.cc
@@ -25,7 +25,6 @@
#include "base/scoped_native_library.h"
#include "base/strings/string_number_conversions.h"
#include "base/strings/utf_string_conversions.h"
-#include "base/win/metro.h"
#include "base/win/registry.h"
#include "base/win/win_util.h"
#include "base/win/windows_version.h"
@@ -279,21 +278,6 @@ int DoUninstallTasks(bool chrome_still_running) {
ChromeBrowserMainPartsWin::ChromeBrowserMainPartsWin(
const content::MainFunctionParams& parameters)
: ChromeBrowserMainParts(parameters) {
- if (base::win::IsMetroProcess()) {
- typedef const wchar_t* (*GetMetroSwitches)(void);
- GetMetroSwitches metro_switches_proc = reinterpret_cast<GetMetroSwitches>(
- GetProcAddress(base::win::GetMetroModule(),
- "GetMetroCommandLineSwitches"));
- if (metro_switches_proc) {
- base::string16 metro_switches = (*metro_switches_proc)();
- if (!metro_switches.empty()) {
- base::CommandLine extra_switches(base::CommandLine::NO_PROGRAM);
- extra_switches.ParseFromString(metro_switches);
- base::CommandLine::ForCurrentProcess()->AppendArguments(extra_switches,
- false);
- }
- }
- }
}
ChromeBrowserMainPartsWin::~ChromeBrowserMainPartsWin() {
@@ -542,10 +526,6 @@ bool ChromeBrowserMainPartsWin::CheckMachineLevelInstall() {
sei.nShow = SW_SHOWNORMAL;
sei.lpFile = setup_exe.value().c_str();
sei.lpParameters = params.c_str();
- // On Windows 8 SEE_MASK_FLAG_LOG_USAGE is necessary to guarantee we
- // flip to the Desktop when launching.
- if (base::win::IsMetroProcess())
- sei.fMask |= SEE_MASK_FLAG_LOG_USAGE;
if (!::ShellExecuteEx(&sei))
DPCHECK(false);

Powered by Google App Engine
This is Rietveld 408576698