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/base_switches.h" | 10 #include "base/base_switches.h" |
(...skipping 27 matching lines...) Expand all Loading... |
38 #include "components/signin/core/account_id/account_id.h" | 38 #include "components/signin/core/account_id/account_id.h" |
39 #include "components/tracing/tracing_switches.h" | 39 #include "components/tracing/tracing_switches.h" |
40 #include "content/public/browser/browser_thread.h" | 40 #include "content/public/browser/browser_thread.h" |
41 #include "content/public/common/content_switches.h" | 41 #include "content/public/common/content_switches.h" |
42 #include "gpu/command_buffer/service/gpu_switches.h" | 42 #include "gpu/command_buffer/service/gpu_switches.h" |
43 #include "media/base/media_switches.h" | 43 #include "media/base/media_switches.h" |
44 #include "third_party/cros_system_api/switches/chrome_switches.h" | 44 #include "third_party/cros_system_api/switches/chrome_switches.h" |
45 #include "ui/app_list/app_list_switches.h" | 45 #include "ui/app_list/app_list_switches.h" |
46 #include "ui/base/ui_base_switches.h" | 46 #include "ui/base/ui_base_switches.h" |
47 #include "ui/compositor/compositor_switches.h" | 47 #include "ui/compositor/compositor_switches.h" |
| 48 #include "ui/display/display_switches.h" |
48 #include "ui/events/event_switches.h" | 49 #include "ui/events/event_switches.h" |
49 #include "ui/gfx/switches.h" | 50 #include "ui/gfx/switches.h" |
50 #include "ui/gl/gl_switches.h" | 51 #include "ui/gl/gl_switches.h" |
51 #include "ui/ozone/public/ozone_switches.h" | 52 #include "ui/ozone/public/ozone_switches.h" |
52 #include "ui/wm/core/wm_core_switches.h" | 53 #include "ui/wm/core/wm_core_switches.h" |
53 #include "url/gurl.h" | 54 #include "url/gurl.h" |
54 | 55 |
55 using content::BrowserThread; | 56 using content::BrowserThread; |
56 | 57 |
57 namespace chromeos { | 58 namespace chromeos { |
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
357 // Relaunch chrome without session manager on dev box. | 358 // Relaunch chrome without session manager on dev box. |
358 ReLaunch(command_line); | 359 ReLaunch(command_line); |
359 return; | 360 return; |
360 } | 361 } |
361 | 362 |
362 // ChromeRestartRequest deletes itself after request sent to session manager. | 363 // ChromeRestartRequest deletes itself after request sent to session manager. |
363 (new ChromeRestartRequest(command_line.argv()))->Start(); | 364 (new ChromeRestartRequest(command_line.argv()))->Start(); |
364 } | 365 } |
365 | 366 |
366 } // namespace chromeos | 367 } // namespace chromeos |
OLD | NEW |