| 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/ash_switches.h" | 9 #include "ash/ash_switches.h" |
| 10 #include "base/base_switches.h" | 10 #include "base/base_switches.h" |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 66 // - Set start url if given; | 66 // - Set start url if given; |
| 67 // - Append/override switches using |new_switches|; | 67 // - Append/override switches using |new_switches|; |
| 68 void DeriveCommandLine(const GURL& start_url, | 68 void DeriveCommandLine(const GURL& start_url, |
| 69 const base::CommandLine& base_command_line, | 69 const base::CommandLine& base_command_line, |
| 70 const base::DictionaryValue& new_switches, | 70 const base::DictionaryValue& new_switches, |
| 71 base::CommandLine* command_line) { | 71 base::CommandLine* command_line) { |
| 72 DCHECK_NE(&base_command_line, command_line); | 72 DCHECK_NE(&base_command_line, command_line); |
| 73 | 73 |
| 74 static const char* const kForwardSwitches[] = { | 74 static const char* const kForwardSwitches[] = { |
| 75 ::switches::kBlinkSettings, | 75 ::switches::kBlinkSettings, |
| 76 ::switches::kDisable2dCanvasImageChromium, |
| 76 ::switches::kDisableAccelerated2dCanvas, | 77 ::switches::kDisableAccelerated2dCanvas, |
| 77 ::switches::kDisableAcceleratedJpegDecoding, | 78 ::switches::kDisableAcceleratedJpegDecoding, |
| 78 ::switches::kDisableAcceleratedMjpegDecode, | 79 ::switches::kDisableAcceleratedMjpegDecode, |
| 79 ::switches::kDisableAcceleratedVideoDecode, | 80 ::switches::kDisableAcceleratedVideoDecode, |
| 80 ::switches::kDisableBlinkFeatures, | 81 ::switches::kDisableBlinkFeatures, |
| 81 ::switches::kDisableCastStreamingHWEncoding, | 82 ::switches::kDisableCastStreamingHWEncoding, |
| 82 ::switches::kDisableDistanceFieldText, | 83 ::switches::kDisableDistanceFieldText, |
| 83 ::switches::kDisableGpu, | 84 ::switches::kDisableGpu, |
| 84 ::switches::kDisableGpuMemoryBufferVideoFrames, | 85 ::switches::kDisableGpuMemoryBufferVideoFrames, |
| 85 ::switches::kDisableGpuShaderDiskCache, | 86 ::switches::kDisableGpuShaderDiskCache, |
| (...skipping 266 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 352 // Relaunch chrome without session manager on dev box. | 353 // Relaunch chrome without session manager on dev box. |
| 353 ReLaunch(command_line); | 354 ReLaunch(command_line); |
| 354 return; | 355 return; |
| 355 } | 356 } |
| 356 | 357 |
| 357 // ChromeRestartRequest deletes itself after request sent to session manager. | 358 // ChromeRestartRequest deletes itself after request sent to session manager. |
| 358 (new ChromeRestartRequest(command_line.argv()))->Start(); | 359 (new ChromeRestartRequest(command_line.argv()))->Start(); |
| 359 } | 360 } |
| 360 | 361 |
| 361 } // namespace chromeos | 362 } // namespace chromeos |
| OLD | NEW |