chrome/browser/browser_process_impl.cc - Issue 436503002: Moved CreateNativeAppWindow from AppWindow::Delegate to AppsClient.

Side by Side Diff: chrome/browser/browser_process_impl.cc

Issue 436503002: Moved CreateNativeAppWindow from AppWindow::Delegate to AppsClient. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase. Created 6 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 | « chrome/browser/apps/chrome_apps_client.cc ('k') | chrome/browser/extensions/api/app_window/app_window_api.cc » ('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 #include "chrome/browser/browser_process_impl.h"	5 #include "chrome/browser/browser_process_impl.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8 #include <map>	8 #include <map>

9 #include <vector>	9 #include <vector>

10	10

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

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

13 #include "base/bind_helpers.h"	13 #include "base/bind_helpers.h"

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

15 #include "base/debug/alias.h"	15 #include "base/debug/alias.h"

16 #include "base/debug/leak_annotations.h"	16 #include "base/debug/leak_annotations.h"

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

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

19 #include "base/path_service.h"	19 #include "base/path_service.h"

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

21 #include "base/prefs/pref_registry_simple.h"	21 #include "base/prefs/pref_registry_simple.h"

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

23 #include "base/synchronization/waitable_event.h"	23 #include "base/synchronization/waitable_event.h"

24 #include "base/threading/thread.h"	24 #include "base/threading/thread.h"

25 #include "base/threading/thread_restrictions.h"	25 #include "base/threading/thread_restrictions.h"

26 #include "base/time/default_tick_clock.h"	26 #include "base/time/default_tick_clock.h"

27 #include "chrome/browser/apps/chrome_apps_client.h"

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

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

30 #include "chrome/browser/chrome_content_browser_client.h"	29 #include "chrome/browser/chrome_content_browser_client.h"

31 #include "chrome/browser/chrome_notification_types.h"	30 #include "chrome/browser/chrome_notification_types.h"

32 #include "chrome/browser/component_updater/component_updater_configurator.h"	31 #include "chrome/browser/component_updater/component_updater_configurator.h"

33 #include "chrome/browser/component_updater/component_updater_service.h"	32 #include "chrome/browser/component_updater/component_updater_service.h"

34 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h"	33 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h"

35 #include "chrome/browser/defaults.h"	34 #include "chrome/browser/defaults.h"

36 #include "chrome/browser/devtools/remote_debugging_server.h"	35 #include "chrome/browser/devtools/remote_debugging_server.h"

37 #include "chrome/browser/download/download_request_limiter.h"	36 #include "chrome/browser/download/download_request_limiter.h"

(...skipping 19 matching lines...) Expand all Loading...
57 #include "chrome/browser/prefs/chrome_pref_service_factory.h"	56 #include "chrome/browser/prefs/chrome_pref_service_factory.h"

58 #include "chrome/browser/prerender/prerender_tracker.h"	57 #include "chrome/browser/prerender/prerender_tracker.h"

59 #include "chrome/browser/printing/background_printing_manager.h"	58 #include "chrome/browser/printing/background_printing_manager.h"

60 #include "chrome/browser/printing/print_job_manager.h"	59 #include "chrome/browser/printing/print_job_manager.h"

61 #include "chrome/browser/printing/print_preview_dialog_controller.h"	60 #include "chrome/browser/printing/print_preview_dialog_controller.h"

62 #include "chrome/browser/profiles/profile_manager.h"	61 #include "chrome/browser/profiles/profile_manager.h"

63 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate. h"	62 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate. h"

64 #include "chrome/browser/safe_browsing/safe_browsing_service.h"	63 #include "chrome/browser/safe_browsing/safe_browsing_service.h"

65 #include "chrome/browser/shell_integration.h"	64 #include "chrome/browser/shell_integration.h"

66 #include "chrome/browser/status_icons/status_tray.h"	65 #include "chrome/browser/status_icons/status_tray.h"

	66 #include "chrome/browser/ui/apps/chrome_apps_client.h"

67 #include "chrome/browser/ui/browser_dialogs.h"	67 #include "chrome/browser/ui/browser_dialogs.h"

68 #include "chrome/browser/ui/browser_finder.h"	68 #include "chrome/browser/ui/browser_finder.h"

69 #include "chrome/browser/web_resource/promo_resource_service.h"	69 #include "chrome/browser/web_resource/promo_resource_service.h"

70 #include "chrome/common/chrome_constants.h"	70 #include "chrome/common/chrome_constants.h"

71 #include "chrome/common/chrome_paths.h"	71 #include "chrome/common/chrome_paths.h"

72 #include "chrome/common/chrome_switches.h"	72 #include "chrome/common/chrome_switches.h"

73 #include "chrome/common/extensions/chrome_extensions_client.h"	73 #include "chrome/common/extensions/chrome_extensions_client.h"

74 #include "chrome/common/pref_names.h"	74 #include "chrome/common/pref_names.h"

75 #include "chrome/common/switch_utils.h"	75 #include "chrome/common/switch_utils.h"

76 #include "chrome/common/url_constants.h"	76 #include "chrome/common/url_constants.h"

(...skipping 1124 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1201 }	1201 }

1202	1202

1203 void BrowserProcessImpl::OnAutoupdateTimer() {	1203 void BrowserProcessImpl::OnAutoupdateTimer() {

1204 if (CanAutorestartForUpdate()) {	1204 if (CanAutorestartForUpdate()) {

1205 DLOG(WARNING) << "Detected update. Restarting browser.";	1205 DLOG(WARNING) << "Detected update. Restarting browser.";

1206 RestartBackgroundInstance();	1206 RestartBackgroundInstance();

1207 }	1207 }

1208 }	1208 }

1209	1209

1210 #endif // (defined(OS_WIN) \|\| defined(OS_LINUX)) && !defined(OS_CHROMEOS)	1210 #endif // (defined(OS_WIN) \|\| defined(OS_LINUX)) && !defined(OS_CHROMEOS)

OLD	NEW