chrome/browser/browser_process_impl.cc - Issue 12578008: Move CrxFile, FileReader, ExtensionResource to src/extensions.

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

Issue 12578008: Move CrxFile, FileReader, ExtensionResource to src/extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 years, 9 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/background/background_application_list_model.cc ('k') | chrome/browser/chromeos/accessibility/accessibility_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 <set>	9 #include <set>

10 #include <vector>	10 #include <vector>

(...skipping 54 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
65 #include "chrome/browser/status_icons/status_tray.h"	65 #include "chrome/browser/status_icons/status_tray.h"

66 #include "chrome/browser/thumbnails/render_widget_snapshot_taker.h"	66 #include "chrome/browser/thumbnails/render_widget_snapshot_taker.h"

67 #include "chrome/browser/ui/bookmarks/bookmark_prompt_controller.h"	67 #include "chrome/browser/ui/bookmarks/bookmark_prompt_controller.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_notification_types.h"	71 #include "chrome/common/chrome_notification_types.h"

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

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

74 #include "chrome/common/extensions/extension_l10n_util.h"	74 #include "chrome/common/extensions/extension_l10n_util.h"

75 #include "chrome/common/extensions/extension_resource.h"

76 #include "chrome/common/pref_names.h"	75 #include "chrome/common/pref_names.h"

77 #include "chrome/common/switch_utils.h"	76 #include "chrome/common/switch_utils.h"

78 #include "chrome/common/url_constants.h"	77 #include "chrome/common/url_constants.h"

79 #include "chrome/installer/util/google_update_constants.h"	78 #include "chrome/installer/util/google_update_constants.h"

80 #include "content/public/browser/browser_thread.h"	79 #include "content/public/browser/browser_thread.h"

81 #include "content/public/browser/child_process_security_policy.h"	80 #include "content/public/browser/child_process_security_policy.h"

82 #include "content/public/browser/notification_details.h"	81 #include "content/public/browser/notification_details.h"

83 #include "content/public/browser/plugin_service.h"	82 #include "content/public/browser/plugin_service.h"

84 #include "content/public/browser/render_process_host.h"	83 #include "content/public/browser/render_process_host.h"

85 #include "content/public/browser/resource_dispatcher_host.h"	84 #include "content/public/browser/resource_dispatcher_host.h"

(...skipping 963 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1049 }	1048 }

1050	1049

1051 void BrowserProcessImpl::OnAutoupdateTimer() {	1050 void BrowserProcessImpl::OnAutoupdateTimer() {

1052 if (CanAutorestartForUpdate()) {	1051 if (CanAutorestartForUpdate()) {

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

1054 RestartBackgroundInstance();	1053 RestartBackgroundInstance();

1055 }	1054 }

1056 }	1055 }

1057	1056

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

OLD	NEW