chrome/browser/chromeos/login/chrome_restart_request.cc - Issue 1658793002: Update chrome for new prefs location.

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

Issue 1658793002: Update chrome for new prefs location. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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

« no previous file with comments | « chrome/browser/chromeos/locale_change_guard.cc ('k') | chrome/browser/chromeos/login/easy_unlock/bootstrap_manager.cc » ('j') | no next file with comments »

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"

11 #include "base/command_line.h"	11 #include "base/command_line.h"

12 #include "base/macros.h"	12 #include "base/macros.h"

13 #include "base/memory/weak_ptr.h"	13 #include "base/memory/weak_ptr.h"

14 #include "base/message_loop/message_loop.h"	14 #include "base/message_loop/message_loop.h"

15 #include "base/prefs/json_pref_store.h"

16 #include "base/prefs/pref_service.h"

17 #include "base/process/launch.h"	15 #include "base/process/launch.h"

18 #include "base/strings/string_split.h"	16 #include "base/strings/string_split.h"

19 #include "base/strings/string_util.h"	17 #include "base/strings/string_util.h"

20 #include "base/strings/stringprintf.h"	18 #include "base/strings/stringprintf.h"

21 #include "base/sys_info.h"	19 #include "base/sys_info.h"

22 #include "base/timer/timer.h"	20 #include "base/timer/timer.h"

23 #include "base/values.h"	21 #include "base/values.h"

24 #include "cc/base/switches.h"	22 #include "cc/base/switches.h"

25 #include "chrome/browser/browser_process.h"	23 #include "chrome/browser/browser_process.h"

26 #include "chrome/browser/chromeos/boot_times_recorder.h"	24 #include "chrome/browser/chromeos/boot_times_recorder.h"

27 #include "chrome/browser/lifetime/application_lifetime.h"	25 #include "chrome/browser/lifetime/application_lifetime.h"

28 #include "chrome/common/chrome_constants.h"	26 #include "chrome/common/chrome_constants.h"

29 #include "chrome/common/chrome_paths.h"	27 #include "chrome/common/chrome_paths.h"

30 #include "chrome/common/chrome_switches.h"	28 #include "chrome/common/chrome_switches.h"

31 #include "chrome/common/url_constants.h"	29 #include "chrome/common/url_constants.h"

32 #include "chromeos/chromeos_switches.h"	30 #include "chromeos/chromeos_switches.h"

33 #include "chromeos/dbus/dbus_thread_manager.h"	31 #include "chromeos/dbus/dbus_thread_manager.h"

34 #include "chromeos/dbus/session_manager_client.h"	32 #include "chromeos/dbus/session_manager_client.h"

35 #include "chromeos/login/user_names.h"	33 #include "chromeos/login/user_names.h"

36 #include "components/policy/core/common/policy_switches.h"	34 #include "components/policy/core/common/policy_switches.h"

	35 #include "components/prefs/json_pref_store.h"

	36 #include "components/prefs/pref_service.h"

37 #include "components/signin/core/account_id/account_id.h"	37 #include "components/signin/core/account_id/account_id.h"

38 #include "components/tracing/tracing_switches.h"	38 #include "components/tracing/tracing_switches.h"

39 #include "content/public/browser/browser_thread.h"	39 #include "content/public/browser/browser_thread.h"

40 #include "content/public/common/content_switches.h"	40 #include "content/public/common/content_switches.h"

41 #include "gpu/command_buffer/service/gpu_switches.h"	41 #include "gpu/command_buffer/service/gpu_switches.h"

42 #include "media/base/media_switches.h"	42 #include "media/base/media_switches.h"

43 #include "third_party/cros_system_api/switches/chrome_switches.h"	43 #include "third_party/cros_system_api/switches/chrome_switches.h"

44 #include "ui/app_list/app_list_switches.h"	44 #include "ui/app_list/app_list_switches.h"

45 #include "ui/base/ui_base_switches.h"	45 #include "ui/base/ui_base_switches.h"

46 #include "ui/compositor/compositor_switches.h"	46 #include "ui/compositor/compositor_switches.h"

(...skipping 308 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
355 // Relaunch chrome without session manager on dev box.	355 // Relaunch chrome without session manager on dev box.

356 ReLaunch(command_line);	356 ReLaunch(command_line);

357 return;	357 return;

358 }	358 }

359	359

360 // ChromeRestartRequest deletes itself after request sent to session manager.	360 // ChromeRestartRequest deletes itself after request sent to session manager.

361 (new ChromeRestartRequest(command_line.argv()))->Start();	361 (new ChromeRestartRequest(command_line.argv()))->Start();

362 }	362 }

363	363

364 } // namespace chromeos	364 } // namespace chromeos

OLD	NEW