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

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

Issue 829803003: Adding Chrome-side WebVR interface (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed the rest of sievers@ input Created 5 years, 9 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
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 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
150 #if defined(USE_CRAS) 150 #if defined(USE_CRAS)
151 ::switches::kUseCras, 151 ::switches::kUseCras,
152 #endif 152 #endif
153 ::switches::kUseGL, 153 ::switches::kUseGL,
154 ::switches::kUseNormalPriorityForTileTaskWorkerThreads, 154 ::switches::kUseNormalPriorityForTileTaskWorkerThreads,
155 ::switches::kUserDataDir, 155 ::switches::kUserDataDir,
156 ::switches::kV, 156 ::switches::kV,
157 ::switches::kVModule, 157 ::switches::kVModule,
158 ::switches::kEnableWebGLDraftExtensions, 158 ::switches::kEnableWebGLDraftExtensions,
159 ::switches::kEnableWebGLImageChromium, 159 ::switches::kEnableWebGLImageChromium,
160 ::switches::kEnableWebVR,
160 #if defined(ENABLE_WEBRTC) 161 #if defined(ENABLE_WEBRTC)
161 ::switches::kDisableWebRtcHWDecoding, 162 ::switches::kDisableWebRtcHWDecoding,
162 ::switches::kDisableWebRtcHWEncoding, 163 ::switches::kDisableWebRtcHWEncoding,
163 ::switches::kEnableWebRtcHWH264Encoding, 164 ::switches::kEnableWebRtcHWH264Encoding,
164 #endif 165 #endif
165 ::switches::kDisableVaapiAcceleratedVideoEncode, 166 ::switches::kDisableVaapiAcceleratedVideoEncode,
166 #if defined(USE_OZONE) 167 #if defined(USE_OZONE)
167 ::switches::kOzoneInitialDisplayBounds, 168 ::switches::kOzoneInitialDisplayBounds,
168 ::switches::kOzoneInitialDisplayPhysicalSizeMm, 169 ::switches::kOzoneInitialDisplayPhysicalSizeMm,
169 ::switches::kOzonePlatform, 170 ::switches::kOzonePlatform,
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 // Relaunch chrome without session manager on dev box. 378 // Relaunch chrome without session manager on dev box.
378 ReLaunch(command_line); 379 ReLaunch(command_line);
379 return; 380 return;
380 } 381 }
381 382
382 // ChromeRestartRequest deletes itself after request sent to session manager. 383 // ChromeRestartRequest deletes itself after request sent to session manager.
383 (new ChromeRestartRequest(command_line))->Start(); 384 (new ChromeRestartRequest(command_line))->Start();
384 } 385 }
385 386
386 } // namespace chromeos 387 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698