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 30 matching lines...) Expand all Loading... |
41 #include "ui/gl/gl_switches.h" | 41 #include "ui/gl/gl_switches.h" |
42 #include "ui/views/corewm/corewm_switches.h" | 42 #include "ui/views/corewm/corewm_switches.h" |
43 #include "url/gurl.h" | 43 #include "url/gurl.h" |
44 | 44 |
45 using content::BrowserThread; | 45 using content::BrowserThread; |
46 | 46 |
47 namespace chromeos { | 47 namespace chromeos { |
48 | 48 |
49 namespace { | 49 namespace { |
50 | 50 |
51 // Increase logging level for Guest mode to avoid LOG(INFO) messages in logs. | 51 // Increase logging level for Guest mode to avoid INFO messages in logs. |
52 const char kGuestModeLoggingLevel[] = "1"; | 52 const char kGuestModeLoggingLevel[] = "1"; |
53 | 53 |
54 // Format of command line switch. | 54 // Format of command line switch. |
55 const char kSwitchFormatString[] = " --%s=\"%s\""; | 55 const char kSwitchFormatString[] = " --%s=\"%s\""; |
56 | 56 |
57 // Derives the new command line from |base_command_line| by doing the following: | 57 // Derives the new command line from |base_command_line| by doing the following: |
58 // - Forward a given switches list to new command; | 58 // - Forward a given switches list to new command; |
59 // - Set start url if given; | 59 // - Set start url if given; |
60 // - Append/override switches using |new_switches|; | 60 // - Append/override switches using |new_switches|; |
61 std::string DeriveCommandLine(const GURL& start_url, | 61 std::string DeriveCommandLine(const GURL& start_url, |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
140 #endif | 140 #endif |
141 ::switches::kUseGL, | 141 ::switches::kUseGL, |
142 ::switches::kUserDataDir, | 142 ::switches::kUserDataDir, |
143 ::switches::kV, | 143 ::switches::kV, |
144 ::switches::kVModule, | 144 ::switches::kVModule, |
145 ::switches::kWebGLCommandBufferSizeKb, | 145 ::switches::kWebGLCommandBufferSizeKb, |
146 ::switches::kEnableWebGLDraftExtensions, | 146 ::switches::kEnableWebGLDraftExtensions, |
147 #if defined(ENABLE_WEBRTC) | 147 #if defined(ENABLE_WEBRTC) |
148 ::switches::kDisableWebRtcHWDecoding, | 148 ::switches::kDisableWebRtcHWDecoding, |
149 ::switches::kDisableWebRtcHWEncoding, | 149 ::switches::kDisableWebRtcHWEncoding, |
| 150 ::switches::kEnableAudioTrackProcessing, |
150 ::switches::kEnableWebRtcHWVp8Encoding, | 151 ::switches::kEnableWebRtcHWVp8Encoding, |
151 #endif | 152 #endif |
152 ash::switches::kAshDefaultWallpaperLarge, | 153 ash::switches::kAshDefaultWallpaperLarge, |
153 ash::switches::kAshDefaultWallpaperSmall, | 154 ash::switches::kAshDefaultWallpaperSmall, |
154 #if defined(OS_CHROMEOS) | 155 #if defined(OS_CHROMEOS) |
155 ash::switches::kAshDisableAudioDeviceMenu, | 156 ash::switches::kAshDisableAudioDeviceMenu, |
156 #endif | 157 #endif |
157 ash::switches::kAshGuestWallpaperLarge, | 158 ash::switches::kAshGuestWallpaperLarge, |
158 ash::switches::kAshGuestWallpaperSmall, | 159 ash::switches::kAshGuestWallpaperSmall, |
159 ash::switches::kAshHostWindowBounds, | 160 ash::switches::kAshHostWindowBounds, |
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
366 // Relaunch chrome without session manager on dev box. | 367 // Relaunch chrome without session manager on dev box. |
367 ReLaunch(command_line); | 368 ReLaunch(command_line); |
368 return; | 369 return; |
369 } | 370 } |
370 | 371 |
371 // ChromeRestartRequest deletes itself after request sent to session manager. | 372 // ChromeRestartRequest deletes itself after request sent to session manager. |
372 (new ChromeRestartRequest(command_line))->Start(); | 373 (new ChromeRestartRequest(command_line))->Start(); |
373 } | 374 } |
374 | 375 |
375 } // namespace chromeos | 376 } // namespace chromeos |
OLD | NEW |