OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 | 4 |
5 #include "chrome/browser/chromeos/login/chrome_restart_request.h" | 5 #include "chrome/browser/chromeos/login/chrome_restart_request.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "ash/common/ash_switches.h" | 9 #include "ash/common/ash_switches.h" |
10 #include "base/base_switches.h" | 10 #include "base/base_switches.h" |
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
131 ::switches::kGpuStartupDialog, | 131 ::switches::kGpuStartupDialog, |
132 ::switches::kGpuSandboxAllowSysVShm, | 132 ::switches::kGpuSandboxAllowSysVShm, |
133 ::switches::kGpuSandboxFailuresFatal, | 133 ::switches::kGpuSandboxFailuresFatal, |
134 ::switches::kGpuSandboxStartEarly, | 134 ::switches::kGpuSandboxStartEarly, |
135 ::switches::kNoSandbox, | 135 ::switches::kNoSandbox, |
136 ::switches::kNumRasterThreads, | 136 ::switches::kNumRasterThreads, |
137 ::switches::kPpapiFlashArgs, | 137 ::switches::kPpapiFlashArgs, |
138 ::switches::kPpapiFlashPath, | 138 ::switches::kPpapiFlashPath, |
139 ::switches::kPpapiFlashVersion, | 139 ::switches::kPpapiFlashVersion, |
140 ::switches::kPpapiInProcess, | 140 ::switches::kPpapiInProcess, |
141 ::switches::kRemoteDebuggingPort, | |
emaxx
2016/07/13 18:25:40
I'm wondering whether a race between the current C
achuithb
2016/07/14 09:21:14
It shouldn't be in use though right? I'm assuming
emaxx
2016/07/14 18:27:02
OK, I see: as this code (the GetOffTheRecordComman
| |
141 ::switches::kRendererStartupDialog, | 142 ::switches::kRendererStartupDialog, |
142 ::switches::kRootLayerScrolls, | 143 ::switches::kRootLayerScrolls, |
143 ::switches::kEnableShareGroupAsyncTextureUpload, | 144 ::switches::kEnableShareGroupAsyncTextureUpload, |
144 #if defined(USE_X11) || defined(USE_OZONE) | 145 #if defined(USE_X11) || defined(USE_OZONE) |
145 ::switches::kTouchCalibration, | 146 ::switches::kTouchCalibration, |
146 #endif | 147 #endif |
147 ::switches::kTouchDevices, | 148 ::switches::kTouchDevices, |
148 ::switches::kTouchEvents, | 149 ::switches::kTouchEvents, |
149 ::switches::kTopChromeMD, | 150 ::switches::kTopChromeMD, |
150 ::switches::kTraceToConsole, | 151 ::switches::kTraceToConsole, |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
358 // Relaunch chrome without session manager on dev box. | 359 // Relaunch chrome without session manager on dev box. |
359 ReLaunch(command_line); | 360 ReLaunch(command_line); |
360 return; | 361 return; |
361 } | 362 } |
362 | 363 |
363 // ChromeRestartRequest deletes itself after request sent to session manager. | 364 // ChromeRestartRequest deletes itself after request sent to session manager. |
364 (new ChromeRestartRequest(command_line.argv()))->Start(); | 365 (new ChromeRestartRequest(command_line.argv()))->Start(); |
365 } | 366 } |
366 | 367 |
367 } // namespace chromeos | 368 } // namespace chromeos |
OLD | NEW |