| 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/chrome_browser_main.h" | 5 #include "chrome/browser/chrome_browser_main.h" |
| 6 | 6 |
| 7 #include <set> | 7 #include <set> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 50 #include "chrome/browser/component_updater/cld_component_installer.h" | 50 #include "chrome/browser/component_updater/cld_component_installer.h" |
| 51 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h" | 51 #include "chrome/browser/component_updater/ev_whitelist_component_installer.h" |
| 52 #include "chrome/browser/component_updater/flash_component_installer.h" | 52 #include "chrome/browser/component_updater/flash_component_installer.h" |
| 53 #include "chrome/browser/component_updater/recovery_component_installer.h" | 53 #include "chrome/browser/component_updater/recovery_component_installer.h" |
| 54 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
" | 54 #include "chrome/browser/component_updater/supervised_user_whitelist_installer.h
" |
| 55 #include "chrome/browser/component_updater/swiftshader_component_installer.h" | 55 #include "chrome/browser/component_updater/swiftshader_component_installer.h" |
| 56 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" | 56 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" |
| 57 #include "chrome/browser/defaults.h" | 57 #include "chrome/browser/defaults.h" |
| 58 #include "chrome/browser/first_run/first_run.h" | 58 #include "chrome/browser/first_run/first_run.h" |
| 59 #include "chrome/browser/first_run/upgrade_util.h" | 59 #include "chrome/browser/first_run/upgrade_util.h" |
| 60 #include "chrome/browser/google/google_search_counter.h" | |
| 61 #include "chrome/browser/gpu/gl_string_manager.h" | 60 #include "chrome/browser/gpu/gl_string_manager.h" |
| 62 #include "chrome/browser/gpu/three_d_api_observer.h" | 61 #include "chrome/browser/gpu/three_d_api_observer.h" |
| 63 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 62 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
| 64 #include "chrome/browser/memory/oom_priority_manager.h" | 63 #include "chrome/browser/memory/oom_priority_manager.h" |
| 65 #include "chrome/browser/metrics/field_trial_synchronizer.h" | 64 #include "chrome/browser/metrics/field_trial_synchronizer.h" |
| 66 #include "chrome/browser/metrics/metrics_services_manager.h" | 65 #include "chrome/browser/metrics/metrics_services_manager.h" |
| 67 #include "chrome/browser/metrics/thread_watcher.h" | 66 #include "chrome/browser/metrics/thread_watcher.h" |
| 68 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" | 67 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" |
| 69 #include "chrome/browser/net/chrome_net_log.h" | 68 #include "chrome/browser/net/chrome_net_log.h" |
| 70 #include "chrome/browser/net/crl_set_fetcher.h" | 69 #include "chrome/browser/net/crl_set_fetcher.h" |
| (...skipping 1470 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1541 // sleep for seven seconds (to avoid slowing startup), and wake up afterwards | 1540 // sleep for seven seconds (to avoid slowing startup), and wake up afterwards |
| 1542 // to see if it should do anything else. | 1541 // to see if it should do anything else. |
| 1543 // | 1542 // |
| 1544 // A simpler way of doing all this would be to have some function which could | 1543 // A simpler way of doing all this would be to have some function which could |
| 1545 // give the time elapsed since startup, and simply have this object check that | 1544 // give the time elapsed since startup, and simply have this object check that |
| 1546 // when asked to initialize itself, but this doesn't seem to exist. | 1545 // when asked to initialize itself, but this doesn't seem to exist. |
| 1547 // | 1546 // |
| 1548 // This can't be created in the BrowserProcessImpl constructor because it | 1547 // This can't be created in the BrowserProcessImpl constructor because it |
| 1549 // needs to read prefs that get set after that runs. | 1548 // needs to read prefs that get set after that runs. |
| 1550 browser_process_->intranet_redirect_detector(); | 1549 browser_process_->intranet_redirect_detector(); |
| 1551 GoogleSearchCounter::RegisterForNotifications(); | |
| 1552 | 1550 |
| 1553 #if defined(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD) | 1551 #if defined(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD) |
| 1554 if (parsed_command_line().HasSwitch(switches::kDebugPrint)) { | 1552 if (parsed_command_line().HasSwitch(switches::kDebugPrint)) { |
| 1555 base::FilePath path = | 1553 base::FilePath path = |
| 1556 parsed_command_line().GetSwitchValuePath(switches::kDebugPrint); | 1554 parsed_command_line().GetSwitchValuePath(switches::kDebugPrint); |
| 1557 printing::PrintedDocument::set_debug_dump_path(path); | 1555 printing::PrintedDocument::set_debug_dump_path(path); |
| 1558 } | 1556 } |
| 1559 #endif // defined(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD) | 1557 #endif // defined(ENABLE_PRINT_PREVIEW) && !defined(OFFICIAL_BUILD) |
| 1560 | 1558 |
| 1561 HandleTestParameters(parsed_command_line()); | 1559 HandleTestParameters(parsed_command_line()); |
| (...skipping 286 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1848 chromeos::CrosSettings::Shutdown(); | 1846 chromeos::CrosSettings::Shutdown(); |
| 1849 #endif // defined(OS_CHROMEOS) | 1847 #endif // defined(OS_CHROMEOS) |
| 1850 #endif // defined(OS_ANDROID) | 1848 #endif // defined(OS_ANDROID) |
| 1851 } | 1849 } |
| 1852 | 1850 |
| 1853 // Public members: | 1851 // Public members: |
| 1854 | 1852 |
| 1855 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1853 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1856 chrome_extra_parts_.push_back(parts); | 1854 chrome_extra_parts_.push_back(parts); |
| 1857 } | 1855 } |
| OLD | NEW |