chrome/browser/app_controller_mac.mm - Issue 1658793002: Update chrome for new prefs location.

Side by Side Diff: chrome/browser/app_controller_mac.mm

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/app_controller_mac.h ('k') | chrome/browser/app_controller_mac_browsertest.mm » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 #import "chrome/browser/app_controller_mac.h"	5 #import "chrome/browser/app_controller_mac.h"

6	6

7 #include <stddef.h>	7 #include <stddef.h>

8	8

9 #include "base/auto_reset.h"	9 #include "base/auto_reset.h"

10 #include "base/bind.h"	10 #include "base/bind.h"

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

12 #include "base/files/file_path.h"	12 #include "base/files/file_path.h"

13 #include "base/mac/foundation_util.h"	13 #include "base/mac/foundation_util.h"

14 #include "base/mac/mac_util.h"	14 #include "base/mac/mac_util.h"

15 #include "base/mac/sdk_forward_declarations.h"	15 #include "base/mac/sdk_forward_declarations.h"

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

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

18 #include "base/metrics/histogram.h"	18 #include "base/metrics/histogram.h"

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

20 #include "base/stl_util.h"	19 #include "base/stl_util.h"

21 #include "base/strings/string_number_conversions.h"	20 #include "base/strings/string_number_conversions.h"

22 #include "base/strings/sys_string_conversions.h"	21 #include "base/strings/sys_string_conversions.h"

23 #include "base/strings/utf_string_conversions.h"	22 #include "base/strings/utf_string_conversions.h"

24 #include "chrome/app/chrome_command_ids.h"	23 #include "chrome/app/chrome_command_ids.h"

25 #include "chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h"	24 #include "chrome/browser/apps/app_shim/extension_app_shim_handler_mac.h"

26 #include "chrome/browser/apps/app_window_registry_util.h"	25 #include "chrome/browser/apps/app_window_registry_util.h"

27 #include "chrome/browser/background/background_application_list_model.h"	26 #include "chrome/browser/background/background_application_list_model.h"

28 #include "chrome/browser/background/background_mode_manager.h"	27 #include "chrome/browser/background/background_mode_manager.h"

29 #include "chrome/browser/browser_process.h"	28 #include "chrome/browser/browser_process.h"

(...skipping 49 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
79 #include "chrome/common/cloud_print/cloud_print_class_mac.h"	78 #include "chrome/common/cloud_print/cloud_print_class_mac.h"

80 #include "chrome/common/extensions/extension_constants.h"	79 #include "chrome/common/extensions/extension_constants.h"

81 #include "chrome/common/mac/app_mode_common.h"	80 #include "chrome/common/mac/app_mode_common.h"

82 #include "chrome/common/pref_names.h"	81 #include "chrome/common/pref_names.h"

83 #include "chrome/common/url_constants.h"	82 #include "chrome/common/url_constants.h"

84 #include "chrome/grit/chromium_strings.h"	83 #include "chrome/grit/chromium_strings.h"

85 #include "chrome/grit/generated_resources.h"	84 #include "chrome/grit/generated_resources.h"

86 #include "components/browser_sync/browser/profile_sync_service.h"	85 #include "components/browser_sync/browser/profile_sync_service.h"

87 #include "components/handoff/handoff_manager.h"	86 #include "components/handoff/handoff_manager.h"

88 #include "components/handoff/handoff_utility.h"	87 #include "components/handoff/handoff_utility.h"

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

89 #include "components/sessions/core/tab_restore_service.h"	89 #include "components/sessions/core/tab_restore_service.h"

90 #include "components/signin/core/browser/signin_manager.h"	90 #include "components/signin/core/browser/signin_manager.h"

91 #include "components/signin/core/common/profile_management_switches.h"	91 #include "components/signin/core/common/profile_management_switches.h"

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

93 #include "content/public/browser/download_manager.h"	93 #include "content/public/browser/download_manager.h"

94 #include "content/public/browser/notification_service.h"	94 #include "content/public/browser/notification_service.h"

95 #include "content/public/browser/notification_types.h"	95 #include "content/public/browser/notification_types.h"

96 #include "content/public/browser/plugin_service.h"	96 #include "content/public/browser/plugin_service.h"

97 #include "content/public/browser/user_metrics.h"	97 #include "content/public/browser/user_metrics.h"

98 #include "extensions/browser/extension_registry.h"	98 #include "extensions/browser/extension_registry.h"

(...skipping 1603 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1702	1702

1703 //---------------------------------------------------------------------------	1703 //---------------------------------------------------------------------------

1704	1704

1705 namespace app_controller_mac {	1705 namespace app_controller_mac {

1706	1706

1707 bool IsOpeningNewWindow() {	1707 bool IsOpeningNewWindow() {

1708 return g_is_opening_new_window;	1708 return g_is_opening_new_window;

1709 }	1709 }

1710	1710

1711 } // namespace app_controller_mac	1711 } // namespace app_controller_mac

OLD	NEW