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

Unified Diff: chrome/browser/ui/startup/startup_browser_creator.cc

Issue 2287583003: Linux: Remove --wm-user-time-ms command line argument (Closed)
Patch Set: Rename Created 4 years, 4 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/ui/startup/startup_browser_creator.cc
diff --git a/chrome/browser/ui/startup/startup_browser_creator.cc b/chrome/browser/ui/startup/startup_browser_creator.cc
index 6be2ffe9fbdea20311d81e4793fd568b827d7dc6..c5bce5454100fbf3e3056f8bd17d69b938804cb3 100644
--- a/chrome/browser/ui/startup/startup_browser_creator.cc
+++ b/chrome/browser/ui/startup/startup_browser_creator.cc
@@ -102,10 +102,6 @@
#include "chrome/browser/metrics/jumplist_metrics_win.h"
#endif
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-#include "ui/events/platform/x11/x11_event_source.h"
-#endif
-
#if defined(ENABLE_PRINT_PREVIEW)
#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service.h"
#include "chrome/browser/printing/cloud_print/cloud_print_proxy_service_factory.h"
@@ -703,22 +699,6 @@ bool StartupBrowserCreator::ProcessCmdLineImpl(
}
#endif // defined(OS_WIN)
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
- // Our request to Activate may be discarded on some linux window
- // managers unless given a recent timestamp, so update the timestamp if
- // we were given one.
- if (command_line.HasSwitch(switches::kWmUserTimeMs)) {
- uint64_t time;
- std::string switch_value =
- command_line.GetSwitchValueASCII(switches::kWmUserTimeMs);
- if (base::StringToUint64(switch_value, &time) &&
- ui::X11EventSource::HasInstance()) {
- ui::X11EventSource::GetInstance()->SetLastSeenServerTime(
- static_cast<Time>(time));
- }
- }
-#endif
-
chrome::startup::IsProcessStartup is_process_startup = process_startup ?
chrome::startup::IS_PROCESS_STARTUP :
chrome::startup::IS_NOT_PROCESS_STARTUP;

Powered by Google App Engine
This is Rietveld 408576698