chrome/browser/browser_process_impl.cc - Issue 11630004: DevTools: rename debugger/ to devtools/, move DevTools files into content/renderer/devtools.

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

Issue 11630004: DevTools: rename debugger/ to devtools/, move DevTools files into content/renderer/devtools. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: For landing Created 8 years 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/automation/testing_automation_provider.cc ('k') | chrome/browser/debugger/OWNERS » ('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 <set>	9 #include <set>

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

11	11

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/file_util.h"	16 #include "base/file_util.h"

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

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

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

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

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

22 #include "chrome/browser/automation/automation_provider_list.h"	22 #include "chrome/browser/automation/automation_provider_list.h"

23 #include "chrome/browser/background/background_mode_manager.h"	23 #include "chrome/browser/background/background_mode_manager.h"

24 #include "chrome/browser/chrome_browser_main.h"	24 #include "chrome/browser/chrome_browser_main.h"

25 #include "chrome/browser/chrome_content_browser_client.h"	25 #include "chrome/browser/chrome_content_browser_client.h"

26 #include "chrome/browser/chrome_plugin_service_filter.h"	26 #include "chrome/browser/chrome_plugin_service_filter.h"

27 #include "chrome/browser/component_updater/component_updater_configurator.h"	27 #include "chrome/browser/component_updater/component_updater_configurator.h"

28 #include "chrome/browser/component_updater/component_updater_service.h"	28 #include "chrome/browser/component_updater/component_updater_service.h"

29 #include "chrome/browser/debugger/remote_debugging_server.h"

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

	30 #include "chrome/browser/devtools/remote_debugging_server.h"

31 #include "chrome/browser/download/download_request_limiter.h"	31 #include "chrome/browser/download/download_request_limiter.h"

32 #include "chrome/browser/download/download_status_updater.h"	32 #include "chrome/browser/download/download_status_updater.h"

33 #include "chrome/browser/extensions/event_router_forwarder.h"	33 #include "chrome/browser/extensions/event_router_forwarder.h"

34 #include "chrome/browser/extensions/extension_tab_id_map.h"	34 #include "chrome/browser/extensions/extension_tab_id_map.h"

35 #include "chrome/browser/first_run/upgrade_util.h"	35 #include "chrome/browser/first_run/upgrade_util.h"

36 #include "chrome/browser/gpu/gl_string_manager.h"	36 #include "chrome/browser/gpu/gl_string_manager.h"

37 #include "chrome/browser/icon_manager.h"	37 #include "chrome/browser/icon_manager.h"

38 #include "chrome/browser/intranet_redirect_detector.h"	38 #include "chrome/browser/intranet_redirect_detector.h"

39 #include "chrome/browser/io_thread.h"	39 #include "chrome/browser/io_thread.h"

40 #include "chrome/browser/lifetime/application_lifetime.h"	40 #include "chrome/browser/lifetime/application_lifetime.h"

(...skipping 933 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
974 }	974 }

975	975

976 void BrowserProcessImpl::OnAutoupdateTimer() {	976 void BrowserProcessImpl::OnAutoupdateTimer() {

977 if (CanAutorestartForUpdate()) {	977 if (CanAutorestartForUpdate()) {

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

979 RestartBackgroundInstance();	979 RestartBackgroundInstance();

980 }	980 }

981 }	981 }

982	982

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

OLD	NEW