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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
61 // - Append/override switches using |new_switches|; | 61 // - Append/override switches using |new_switches|; |
62 std::string DeriveCommandLine(const GURL& start_url, | 62 std::string DeriveCommandLine(const GURL& start_url, |
63 const CommandLine& base_command_line, | 63 const CommandLine& base_command_line, |
64 const base::DictionaryValue& new_switches, | 64 const base::DictionaryValue& new_switches, |
65 CommandLine* command_line) { | 65 CommandLine* command_line) { |
66 DCHECK_NE(&base_command_line, command_line); | 66 DCHECK_NE(&base_command_line, command_line); |
67 | 67 |
68 static const char* kForwardSwitches[] = { | 68 static const char* kForwardSwitches[] = { |
69 ::switches::kDisableAccelerated2dCanvas, | 69 ::switches::kDisableAccelerated2dCanvas, |
70 ::switches::kDisableAcceleratedOverflowScroll, | 70 ::switches::kDisableAcceleratedOverflowScroll, |
71 ::switches::kDisableAcceleratedPlugins, | |
72 ::switches::kDisableAcceleratedVideoDecode, | 71 ::switches::kDisableAcceleratedVideoDecode, |
73 ::switches::kDisableBrowserPluginCompositing, | 72 ::switches::kDisableBrowserPluginCompositing, |
74 ::switches::kDisableDelegatedRenderer, | 73 ::switches::kDisableDelegatedRenderer, |
75 ::switches::kDisableFiltersOverIPC, | 74 ::switches::kDisableFiltersOverIPC, |
76 ::switches::kDisableForceCompositingMode, | 75 ::switches::kDisableForceCompositingMode, |
77 ::switches::kDisableGpuShaderDiskCache, | 76 ::switches::kDisableGpuShaderDiskCache, |
78 ::switches::kDisableGpuWatchdog, | 77 ::switches::kDisableGpuWatchdog, |
79 ::switches::kDisableGpuCompositing, | 78 ::switches::kDisableGpuCompositing, |
80 ::switches::kDisablePrefixedEncryptedMedia, | 79 ::switches::kDisablePrefixedEncryptedMedia, |
81 ::switches::kDisablePanelFitting, | 80 ::switches::kDisablePanelFitting, |
(...skipping 273 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
355 // Relaunch chrome without session manager on dev box. | 354 // Relaunch chrome without session manager on dev box. |
356 ReLaunch(command_line); | 355 ReLaunch(command_line); |
357 return; | 356 return; |
358 } | 357 } |
359 | 358 |
360 // ChromeRestartRequest deletes itself after request sent to session manager. | 359 // ChromeRestartRequest deletes itself after request sent to session manager. |
361 (new ChromeRestartRequest(command_line))->Start(); | 360 (new ChromeRestartRequest(command_line))->Start(); |
362 } | 361 } |
363 | 362 |
364 } // namespace chromeos | 363 } // namespace chromeos |
OLD | NEW |