| 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/chromeos/chromeos_version.h" | 10 #include "base/chromeos/chromeos_version.h" |
| (...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 60 // - Forward a given switches list to new command; | 60 // - Forward a given switches list to new command; |
| 61 // - Set start url if given; | 61 // - Set start url if given; |
| 62 // - Append/override switches using |new_switches|; | 62 // - Append/override switches using |new_switches|; |
| 63 std::string DeriveCommandLine(const GURL& start_url, | 63 std::string DeriveCommandLine(const GURL& start_url, |
| 64 const CommandLine& base_command_line, | 64 const CommandLine& base_command_line, |
| 65 const base::DictionaryValue& new_switches, | 65 const base::DictionaryValue& new_switches, |
| 66 CommandLine* command_line) { | 66 CommandLine* command_line) { |
| 67 DCHECK_NE(&base_command_line, command_line); | 67 DCHECK_NE(&base_command_line, command_line); |
| 68 | 68 |
| 69 static const char* kForwardSwitches[] = { | 69 static const char* kForwardSwitches[] = { |
| 70 ::switches::kAllowFiltersOverIPC, |
| 70 ::switches::kAllowWebUICompositing, | 71 ::switches::kAllowWebUICompositing, |
| 71 ::switches::kDeviceManagementUrl, | 72 ::switches::kDeviceManagementUrl, |
| 72 ::switches::kDisableAccelerated2dCanvas, | 73 ::switches::kDisableAccelerated2dCanvas, |
| 73 ::switches::kDisableAcceleratedOverflowScroll, | 74 ::switches::kDisableAcceleratedOverflowScroll, |
| 74 ::switches::kDisableAcceleratedPlugins, | 75 ::switches::kDisableAcceleratedPlugins, |
| 75 ::switches::kDisableAcceleratedVideoDecode, | 76 ::switches::kDisableAcceleratedVideoDecode, |
| 76 ::switches::kDisableBrowserPluginCompositing, | 77 ::switches::kDisableBrowserPluginCompositing, |
| 77 ::switches::kDisableDelegatedRenderer, | 78 ::switches::kDisableDelegatedRenderer, |
| 78 ::switches::kDisableForceCompositingMode, | 79 ::switches::kDisableForceCompositingMode, |
| 79 ::switches::kDisableGpuShaderDiskCache, | 80 ::switches::kDisableGpuShaderDiskCache, |
| (...skipping 270 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 350 // Relaunch chrome without session manager on dev box. | 351 // Relaunch chrome without session manager on dev box. |
| 351 ReLaunch(command_line); | 352 ReLaunch(command_line); |
| 352 return; | 353 return; |
| 353 } | 354 } |
| 354 | 355 |
| 355 // ChromeRestartRequest deletes itself after request sent to session manager. | 356 // ChromeRestartRequest deletes itself after request sent to session manager. |
| 356 (new ChromeRestartRequest(command_line))->Start(); | 357 (new ChromeRestartRequest(command_line))->Start(); |
| 357 } | 358 } |
| 358 | 359 |
| 359 } // namespace chromeos | 360 } // namespace chromeos |
| OLD | NEW |