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/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
65 std::string DeriveCommandLine(const GURL& start_url, | 65 std::string DeriveCommandLine(const GURL& start_url, |
66 const base::CommandLine& base_command_line, | 66 const base::CommandLine& base_command_line, |
67 const base::DictionaryValue& new_switches, | 67 const base::DictionaryValue& new_switches, |
68 base::CommandLine* command_line) { | 68 base::CommandLine* command_line) { |
69 DCHECK_NE(&base_command_line, command_line); | 69 DCHECK_NE(&base_command_line, command_line); |
70 | 70 |
71 static const char* const kForwardSwitches[] = { | 71 static const char* const kForwardSwitches[] = { |
72 ::switches::kDisableAccelerated2dCanvas, | 72 ::switches::kDisableAccelerated2dCanvas, |
73 ::switches::kDisableAcceleratedJpegDecoding, | 73 ::switches::kDisableAcceleratedJpegDecoding, |
74 ::switches::kDisableAcceleratedVideoDecode, | 74 ::switches::kDisableAcceleratedVideoDecode, |
| 75 ::switches::kDisableBlinkFeatures, |
75 ::switches::kDisableCastStreamingHWEncoding, | 76 ::switches::kDisableCastStreamingHWEncoding, |
76 ::switches::kDisableDelegatedRenderer, | 77 ::switches::kDisableDelegatedRenderer, |
77 ::switches::kDisableDistanceFieldText, | 78 ::switches::kDisableDistanceFieldText, |
78 ::switches::kDisableGpu, | 79 ::switches::kDisableGpu, |
79 ::switches::kDisableGpuShaderDiskCache, | 80 ::switches::kDisableGpuShaderDiskCache, |
80 ::switches::kDisableGpuWatchdog, | 81 ::switches::kDisableGpuWatchdog, |
81 ::switches::kDisableGpuCompositing, | 82 ::switches::kDisableGpuCompositing, |
82 ::switches::kDisableGpuRasterization, | 83 ::switches::kDisableGpuRasterization, |
83 ::switches::kDisableImplSidePainting, | 84 ::switches::kDisableImplSidePainting, |
84 ::switches::kDisableLowResTiling, | 85 ::switches::kDisableLowResTiling, |
85 ::switches::kDisableMediaSource, | 86 ::switches::kDisableMediaSource, |
86 ::switches::kDisableOneCopy, | 87 ::switches::kDisableOneCopy, |
87 ::switches::kDisablePreferCompositingToLCDText, | 88 ::switches::kDisablePreferCompositingToLCDText, |
88 ::switches::kDisablePrefixedEncryptedMedia, | 89 ::switches::kDisablePrefixedEncryptedMedia, |
89 ::switches::kDisablePanelFitting, | 90 ::switches::kDisablePanelFitting, |
90 ::switches::kDisableSeccompFilterSandbox, | 91 ::switches::kDisableSeccompFilterSandbox, |
91 ::switches::kDisableSetuidSandbox, | 92 ::switches::kDisableSetuidSandbox, |
92 ::switches::kDisableTextBlobs, | 93 ::switches::kDisableTextBlobs, |
93 ::switches::kDisableThreadedScrolling, | 94 ::switches::kDisableThreadedScrolling, |
94 ::switches::kDisableTouchDragDrop, | 95 ::switches::kDisableTouchDragDrop, |
95 ::switches::kDisableTouchEditing, | 96 ::switches::kDisableTouchEditing, |
96 ::switches::kEnableBeginFrameScheduling, | 97 ::switches::kEnableBeginFrameScheduling, |
| 98 ::switches::kEnableBlinkFeatures, |
97 ::switches::kEnablePreferCompositingToLCDText, | 99 ::switches::kEnablePreferCompositingToLCDText, |
98 ::switches::kEnableDelegatedRenderer, | 100 ::switches::kEnableDelegatedRenderer, |
99 ::switches::kDisableDisplayList2dCanvas, | 101 ::switches::kDisableDisplayList2dCanvas, |
100 ::switches::kEnableDisplayList2dCanvas, | 102 ::switches::kEnableDisplayList2dCanvas, |
101 ::switches::kForceDisplayList2dCanvas, | 103 ::switches::kForceDisplayList2dCanvas, |
102 ::switches::kDisableEncryptedMedia, | 104 ::switches::kDisableEncryptedMedia, |
103 ::switches::kDisableGpuSandbox, | 105 ::switches::kDisableGpuSandbox, |
104 ::switches::kEnableDistanceFieldText, | 106 ::switches::kEnableDistanceFieldText, |
105 ::switches::kEnableGpuRasterization, | 107 ::switches::kEnableGpuRasterization, |
106 ::switches::kEnableImageColorProfiles, | 108 ::switches::kEnableImageColorProfiles, |
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
375 // Relaunch chrome without session manager on dev box. | 377 // Relaunch chrome without session manager on dev box. |
376 ReLaunch(command_line); | 378 ReLaunch(command_line); |
377 return; | 379 return; |
378 } | 380 } |
379 | 381 |
380 // ChromeRestartRequest deletes itself after request sent to session manager. | 382 // ChromeRestartRequest deletes itself after request sent to session manager. |
381 (new ChromeRestartRequest(command_line))->Start(); | 383 (new ChromeRestartRequest(command_line))->Start(); |
382 } | 384 } |
383 | 385 |
384 } // namespace chromeos | 386 } // namespace chromeos |
OLD | NEW |