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 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
64 // - Set start url if given; | 64 // - Set start url if given; |
65 // - Append/override switches using |new_switches|; | 65 // - Append/override switches using |new_switches|; |
66 std::string DeriveCommandLine(const GURL& start_url, | 66 std::string DeriveCommandLine(const GURL& start_url, |
67 const CommandLine& base_command_line, | 67 const CommandLine& base_command_line, |
68 const base::DictionaryValue& new_switches, | 68 const base::DictionaryValue& new_switches, |
69 CommandLine* command_line) { | 69 CommandLine* command_line) { |
70 DCHECK_NE(&base_command_line, command_line); | 70 DCHECK_NE(&base_command_line, command_line); |
71 | 71 |
72 static const char* kForwardSwitches[] = { | 72 static const char* kForwardSwitches[] = { |
73 ::switches::kDisableAccelerated2dCanvas, | 73 ::switches::kDisableAccelerated2dCanvas, |
| 74 ::switches::kDisableAcceleratedOverflowScroll, |
74 ::switches::kDisableAcceleratedVideoDecode, | 75 ::switches::kDisableAcceleratedVideoDecode, |
75 ::switches::kDisableDelegatedRenderer, | 76 ::switches::kDisableDelegatedRenderer, |
76 ::switches::kDisableDistanceFieldText, | 77 ::switches::kDisableDistanceFieldText, |
77 ::switches::kDisableGpu, | 78 ::switches::kDisableGpu, |
78 ::switches::kDisableGpuShaderDiskCache, | 79 ::switches::kDisableGpuShaderDiskCache, |
79 ::switches::kDisableGpuWatchdog, | 80 ::switches::kDisableGpuWatchdog, |
80 ::switches::kDisableGpuCompositing, | 81 ::switches::kDisableGpuCompositing, |
81 ::switches::kDisableGpuRasterization, | 82 ::switches::kDisableGpuRasterization, |
82 ::switches::kDisableImplSidePainting, | 83 ::switches::kDisableImplSidePainting, |
83 ::switches::kDisableLowResTiling, | 84 ::switches::kDisableLowResTiling, |
84 ::switches::kDisableMediaSource, | 85 ::switches::kDisableMediaSource, |
85 ::switches::kDisablePreferCompositingToLCDText, | 86 ::switches::kDisablePreferCompositingToLCDText, |
86 ::switches::kDisablePrefixedEncryptedMedia, | 87 ::switches::kDisablePrefixedEncryptedMedia, |
87 ::switches::kDisablePanelFitting, | 88 ::switches::kDisablePanelFitting, |
88 ::switches::kDisableSeccompFilterSandbox, | 89 ::switches::kDisableSeccompFilterSandbox, |
89 ::switches::kDisableSetuidSandbox, | 90 ::switches::kDisableSetuidSandbox, |
90 ::switches::kDisableTouchDragDrop, | 91 ::switches::kDisableTouchDragDrop, |
91 ::switches::kDisableTouchEditing, | 92 ::switches::kDisableTouchEditing, |
| 93 ::switches::kDisableAcceleratedFixedRootBackground, |
92 ::switches::kDisableZeroCopy, | 94 ::switches::kDisableZeroCopy, |
| 95 ::switches::kEnableAcceleratedFixedRootBackground, |
| 96 ::switches::kEnableAcceleratedOverflowScroll, |
93 ::switches::kEnableBeginFrameScheduling, | 97 ::switches::kEnableBeginFrameScheduling, |
94 ::switches::kEnablePreferCompositingToLCDText, | 98 ::switches::kEnablePreferCompositingToLCDText, |
95 ::switches::kEnableDelegatedRenderer, | 99 ::switches::kEnableDelegatedRenderer, |
96 ::switches::kEnableDisplayList2dCanvas, | 100 ::switches::kEnableDisplayList2dCanvas, |
97 ::switches::kEnableEncryptedMedia, | 101 ::switches::kEnableEncryptedMedia, |
98 ::switches::kDisableGpuSandbox, | 102 ::switches::kDisableGpuSandbox, |
99 ::switches::kDisableDeferredFilters, | 103 ::switches::kDisableDeferredFilters, |
100 ::switches::kEnableContainerCulling, | 104 ::switches::kEnableContainerCulling, |
101 ::switches::kEnableDistanceFieldText, | 105 ::switches::kEnableDistanceFieldText, |
102 ::switches::kEnableGpuRasterization, | 106 ::switches::kEnableGpuRasterization, |
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
367 // Relaunch chrome without session manager on dev box. | 371 // Relaunch chrome without session manager on dev box. |
368 ReLaunch(command_line); | 372 ReLaunch(command_line); |
369 return; | 373 return; |
370 } | 374 } |
371 | 375 |
372 // ChromeRestartRequest deletes itself after request sent to session manager. | 376 // ChromeRestartRequest deletes itself after request sent to session manager. |
373 (new ChromeRestartRequest(command_line))->Start(); | 377 (new ChromeRestartRequest(command_line))->Start(); |
374 } | 378 } |
375 | 379 |
376 } // namespace chromeos | 380 } // namespace chromeos |
OLD | NEW |