Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1269)

Side by Side Diff: trunk/src/chrome/browser/chromeos/login/chrome_restart_request.cc

Issue 357903003: Revert 279958 "Revert "Revert 279650 "Add VaapiVideoEncodeAccele..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | trunk/src/content/browser/gpu/gpu_process_host.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 ::switches::kV, 151 ::switches::kV,
152 ::switches::kVModule, 152 ::switches::kVModule,
153 ::switches::kEnableWebGLDraftExtensions, 153 ::switches::kEnableWebGLDraftExtensions,
154 ::switches::kEnableWebGLImageChromium, 154 ::switches::kEnableWebGLImageChromium,
155 #if defined(ENABLE_WEBRTC) 155 #if defined(ENABLE_WEBRTC)
156 ::switches::kDisableAudioTrackProcessing, 156 ::switches::kDisableAudioTrackProcessing,
157 ::switches::kDisableWebRtcHWDecoding, 157 ::switches::kDisableWebRtcHWDecoding,
158 ::switches::kDisableWebRtcHWEncoding, 158 ::switches::kDisableWebRtcHWEncoding,
159 ::switches::kEnableWebRtcHWVp8Encoding, 159 ::switches::kEnableWebRtcHWVp8Encoding,
160 #endif 160 #endif
161 ::switches::kEnableVaapiAcceleratedVideoEncode,
162 #if defined(USE_OZONE) 161 #if defined(USE_OZONE)
163 ::switches::kOzonePlatform, 162 ::switches::kOzonePlatform,
164 #endif 163 #endif
165 app_list::switches::kDisableSyncAppList, 164 app_list::switches::kDisableSyncAppList,
166 app_list::switches::kEnableSyncAppList, 165 app_list::switches::kEnableSyncAppList,
167 ash::switches::kAshDefaultWallpaperLarge, 166 ash::switches::kAshDefaultWallpaperLarge,
168 ash::switches::kAshDefaultWallpaperSmall, 167 ash::switches::kAshDefaultWallpaperSmall,
169 ash::switches::kAshGuestWallpaperLarge, 168 ash::switches::kAshGuestWallpaperLarge,
170 ash::switches::kAshGuestWallpaperSmall, 169 ash::switches::kAshGuestWallpaperSmall,
171 ash::switches::kAshHostWindowBounds, 170 ash::switches::kAshHostWindowBounds,
(...skipping 202 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW
« no previous file with comments | « no previous file | trunk/src/content/browser/gpu/gpu_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698