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

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

Issue 21421002: Revert EVS revisions 209760, 298753, 213143. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased at 216225, prepare to land 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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 ::switches::kDisableTouchDragDrop, 88 ::switches::kDisableTouchDragDrop,
89 ::switches::kDisableTouchEditing, 89 ::switches::kDisableTouchEditing,
90 ::switches::kDisableWebKitMediaSource, 90 ::switches::kDisableWebKitMediaSource,
91 ::switches::kDisableAcceleratedFixedRootBackground, 91 ::switches::kDisableAcceleratedFixedRootBackground,
92 ::switches::kEnableAcceleratedFixedRootBackground, 92 ::switches::kEnableAcceleratedFixedRootBackground,
93 ::switches::kEnableAcceleratedOverflowScroll, 93 ::switches::kEnableAcceleratedOverflowScroll,
94 ::switches::kEnableBeginFrameScheduling, 94 ::switches::kEnableBeginFrameScheduling,
95 ::switches::kEnableBrowserInputController, 95 ::switches::kEnableBrowserInputController,
96 ::switches::kEnableCompositingForFixedPosition, 96 ::switches::kEnableCompositingForFixedPosition,
97 ::switches::kEnableDelegatedRenderer, 97 ::switches::kEnableDelegatedRenderer,
98 ::switches::kEnableEncodedScreenCapture,
99 ::switches::kEnableEncryptedMedia, 98 ::switches::kEnableEncryptedMedia,
100 ::switches::kEnableGestureTapHighlight, 99 ::switches::kEnableGestureTapHighlight,
101 ::switches::kDisableGestureTapHighlight, 100 ::switches::kDisableGestureTapHighlight,
102 ::switches::kDisableGpuSandbox, 101 ::switches::kDisableGpuSandbox,
103 ::switches::kEnableLogging, 102 ::switches::kEnableLogging,
104 ::switches::kEnablePinch, 103 ::switches::kEnablePinch,
105 ::switches::kEnableThreadedCompositing, 104 ::switches::kEnableThreadedCompositing,
106 ::switches::kEnableTouchDragDrop, 105 ::switches::kEnableTouchDragDrop,
107 ::switches::kEnableTouchEditing, 106 ::switches::kEnableTouchEditing,
108 ::switches::kEnableViewport, 107 ::switches::kEnableViewport,
(...skipping 244 matching lines...) Expand 10 before | Expand all | Expand 10 after
353 // Relaunch chrome without session manager on dev box. 352 // Relaunch chrome without session manager on dev box.
354 ReLaunch(command_line); 353 ReLaunch(command_line);
355 return; 354 return;
356 } 355 }
357 356
358 // ChromeRestartRequest deletes itself after request sent to session manager. 357 // ChromeRestartRequest deletes itself after request sent to session manager.
359 (new ChromeRestartRequest(command_line))->Start(); 358 (new ChromeRestartRequest(command_line))->Start();
360 } 359 }
361 360
362 } // namespace chromeos 361 } // 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