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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 // - Forward a given switches list to new command; | 59 // - Forward a given switches list to new command; |
60 // - Set start url if given; | 60 // - Set start url if given; |
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::kAllowWebUICompositing, | |
70 ::switches::kDisableAccelerated2dCanvas, | 69 ::switches::kDisableAccelerated2dCanvas, |
71 ::switches::kDisableAcceleratedOverflowScroll, | 70 ::switches::kDisableAcceleratedOverflowScroll, |
72 ::switches::kDisableAcceleratedPlugins, | 71 ::switches::kDisableAcceleratedPlugins, |
73 ::switches::kDisableAcceleratedVideoDecode, | 72 ::switches::kDisableAcceleratedVideoDecode, |
74 ::switches::kDisableBrowserPluginCompositing, | 73 ::switches::kDisableBrowserPluginCompositing, |
75 ::switches::kDisableDeadlineScheduling, | 74 ::switches::kDisableDeadlineScheduling, |
76 ::switches::kDisableDelegatedRenderer, | 75 ::switches::kDisableDelegatedRenderer, |
77 ::switches::kDisableFiltersOverIPC, | 76 ::switches::kDisableFiltersOverIPC, |
78 ::switches::kDisableForceCompositingMode, | 77 ::switches::kDisableForceCompositingMode, |
79 ::switches::kDisableGpuShaderDiskCache, | 78 ::switches::kDisableGpuShaderDiskCache, |
(...skipping 294 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
374 // Relaunch chrome without session manager on dev box. | 373 // Relaunch chrome without session manager on dev box. |
375 ReLaunch(command_line); | 374 ReLaunch(command_line); |
376 return; | 375 return; |
377 } | 376 } |
378 | 377 |
379 // ChromeRestartRequest deletes itself after request sent to session manager. | 378 // ChromeRestartRequest deletes itself after request sent to session manager. |
380 (new ChromeRestartRequest(command_line))->Start(); | 379 (new ChromeRestartRequest(command_line))->Start(); |
381 } | 380 } |
382 | 381 |
383 } // namespace chromeos | 382 } // namespace chromeos |
OLD | NEW |