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 50 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
61 // - Forward a given switches list to new command; | 61 // - Forward a given switches list to new command; |
62 // - Set start url if given; | 62 // - Set start url if given; |
63 // - Append/override switches using |new_switches|; | 63 // - Append/override switches using |new_switches|; |
64 std::string DeriveCommandLine(const GURL& start_url, | 64 std::string DeriveCommandLine(const GURL& start_url, |
65 const CommandLine& base_command_line, | 65 const CommandLine& base_command_line, |
66 const base::DictionaryValue& new_switches, | 66 const base::DictionaryValue& new_switches, |
67 CommandLine* command_line) { | 67 CommandLine* command_line) { |
68 DCHECK_NE(&base_command_line, command_line); | 68 DCHECK_NE(&base_command_line, command_line); |
69 | 69 |
70 static const char* kForwardSwitches[] = { | 70 static const char* kForwardSwitches[] = { |
71 ::switches::kAllowFiltersOverIPC, | |
jochen (gone - plz use gerrit)
2013/08/07 04:44:38
why do you add the flag here?
sugoi1
2013/08/07 11:43:54
I thought the flag should be persistent, even on r
danakj
2013/08/07 13:01:13
This forwards the flag if present to the renderer
| |
71 ::switches::kAllowWebUICompositing, | 72 ::switches::kAllowWebUICompositing, |
72 ::switches::kDeviceManagementUrl, | 73 ::switches::kDeviceManagementUrl, |
73 ::switches::kDisableAccelerated2dCanvas, | 74 ::switches::kDisableAccelerated2dCanvas, |
74 ::switches::kDisableAcceleratedOverflowScroll, | 75 ::switches::kDisableAcceleratedOverflowScroll, |
75 ::switches::kDisableAcceleratedPlugins, | 76 ::switches::kDisableAcceleratedPlugins, |
76 ::switches::kDisableAcceleratedVideoDecode, | 77 ::switches::kDisableAcceleratedVideoDecode, |
77 ::switches::kDisableBrowserPluginCompositing, | 78 ::switches::kDisableBrowserPluginCompositing, |
78 ::switches::kDisableDelegatedRenderer, | 79 ::switches::kDisableDelegatedRenderer, |
79 ::switches::kDisableForceCompositingMode, | 80 ::switches::kDisableForceCompositingMode, |
80 ::switches::kDisableGpuShaderDiskCache, | 81 ::switches::kDisableGpuShaderDiskCache, |
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
353 // Relaunch chrome without session manager on dev box. | 354 // Relaunch chrome without session manager on dev box. |
354 ReLaunch(command_line); | 355 ReLaunch(command_line); |
355 return; | 356 return; |
356 } | 357 } |
357 | 358 |
358 // ChromeRestartRequest deletes itself after request sent to session manager. | 359 // ChromeRestartRequest deletes itself after request sent to session manager. |
359 (new ChromeRestartRequest(command_line))->Start(); | 360 (new ChromeRestartRequest(command_line))->Start(); |
360 } | 361 } |
361 | 362 |
362 } // namespace chromeos | 363 } // namespace chromeos |
OLD | NEW |