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

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

Issue 23125008: Revert 217691 "Merge 217276 "Add media::VideoEncodeAccelerator w..." (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1599/src/
Patch Set: Created 7 years, 4 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 | content/browser/renderer_host/render_process_host_impl.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/chromeos/chromeos_version.h" 10 #include "base/chromeos/chromeos_version.h"
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 ::switches::kUIDisableThreadedCompositing, 128 ::switches::kUIDisableThreadedCompositing,
129 ::switches::kUIMaxFramesPending, 129 ::switches::kUIMaxFramesPending,
130 ::switches::kUIPrioritizeInGpuProcess, 130 ::switches::kUIPrioritizeInGpuProcess,
131 #if defined(USE_CRAS) 131 #if defined(USE_CRAS)
132 ::switches::kUseCras, 132 ::switches::kUseCras,
133 #endif 133 #endif
134 ::switches::kUseGL, 134 ::switches::kUseGL,
135 ::switches::kUserDataDir, 135 ::switches::kUserDataDir,
136 ::switches::kV, 136 ::switches::kV,
137 ::switches::kEnableWebGLDraftExtensions, 137 ::switches::kEnableWebGLDraftExtensions,
138 #if defined(ENABLE_WEBRTC)
139 ::switches::kEnableWebRtcHWDecoding,
140 ::switches::kEnableWebRtcHWEncoding,
141 #endif
142 ash::switches::kAshDefaultGuestWallpaperLarge, 138 ash::switches::kAshDefaultGuestWallpaperLarge,
143 ash::switches::kAshDefaultGuestWallpaperSmall, 139 ash::switches::kAshDefaultGuestWallpaperSmall,
144 ash::switches::kAshDefaultWallpaperLarge, 140 ash::switches::kAshDefaultWallpaperLarge,
145 ash::switches::kAshDefaultWallpaperSmall, 141 ash::switches::kAshDefaultWallpaperSmall,
146 #if defined(OS_CHROMEOS) 142 #if defined(OS_CHROMEOS)
147 ash::switches::kAshDisableAudioDeviceMenu, 143 ash::switches::kAshDisableAudioDeviceMenu,
148 #endif 144 #endif
149 ash::switches::kAshHostWindowBounds, 145 ash::switches::kAshHostWindowBounds,
150 ash::switches::kAshTouchHud, 146 ash::switches::kAshTouchHud,
151 ash::switches::kAuraLegacyPowerButton, 147 ash::switches::kAuraLegacyPowerButton,
(...skipping 203 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 // Relaunch chrome without session manager on dev box. 351 // Relaunch chrome without session manager on dev box.
356 ReLaunch(command_line); 352 ReLaunch(command_line);
357 return; 353 return;
358 } 354 }
359 355
360 // ChromeRestartRequest deletes itself after request sent to session manager. 356 // ChromeRestartRequest deletes itself after request sent to session manager.
361 (new ChromeRestartRequest(command_line))->Start(); 357 (new ChromeRestartRequest(command_line))->Start();
362 } 358 }
363 359
364 } // namespace chromeos 360 } // namespace chromeos
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698