| 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 37 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" | 48 #include "chrome/browser/component_updater/pnacl/pnacl_component_installer.h" |
| 49 #include "chrome/browser/component_updater/recovery_component_installer.h" | 49 #include "chrome/browser/component_updater/recovery_component_installer.h" |
| 50 #include "chrome/browser/component_updater/swiftshader_component_installer.h" | 50 #include "chrome/browser/component_updater/swiftshader_component_installer.h" |
| 51 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" | 51 #include "chrome/browser/component_updater/widevine_cdm_component_installer.h" |
| 52 #include "chrome/browser/defaults.h" | 52 #include "chrome/browser/defaults.h" |
| 53 #include "chrome/browser/extensions/extension_service.h" | 53 #include "chrome/browser/extensions/extension_service.h" |
| 54 #include "chrome/browser/extensions/startup_helper.h" | 54 #include "chrome/browser/extensions/startup_helper.h" |
| 55 #include "chrome/browser/first_run/first_run.h" | 55 #include "chrome/browser/first_run/first_run.h" |
| 56 #include "chrome/browser/first_run/upgrade_util.h" | 56 #include "chrome/browser/first_run/upgrade_util.h" |
| 57 #include "chrome/browser/google/google_search_counter.h" | 57 #include "chrome/browser/google/google_search_counter.h" |
| 58 #include "chrome/browser/gpu/gl_string_manager.h" | 58 #include "chrome/browser/gpu/gpu_pref_manager.h" |
| 59 #include "chrome/browser/gpu/three_d_api_observer.h" | 59 #include "chrome/browser/gpu/three_d_api_observer.h" |
| 60 #include "chrome/browser/media/media_capture_devices_dispatcher.h" | 60 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
| 61 #include "chrome/browser/metrics/field_trial_synchronizer.h" | 61 #include "chrome/browser/metrics/field_trial_synchronizer.h" |
| 62 #include "chrome/browser/metrics/thread_watcher.h" | 62 #include "chrome/browser/metrics/thread_watcher.h" |
| 63 #include "chrome/browser/metrics/tracking_synchronizer.h" | 63 #include "chrome/browser/metrics/tracking_synchronizer.h" |
| 64 #include "chrome/browser/metrics/variations/variations_service.h" | 64 #include "chrome/browser/metrics/variations/variations_service.h" |
| 65 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" | 65 #include "chrome/browser/nacl_host/nacl_browser_delegate_impl.h" |
| 66 #include "chrome/browser/net/chrome_net_log.h" | 66 #include "chrome/browser/net/chrome_net_log.h" |
| 67 #include "chrome/browser/net/crl_set_fetcher.h" | 67 #include "chrome/browser/net/crl_set_fetcher.h" |
| 68 #include "chrome/browser/notifications/desktop_notification_service.h" | 68 #include "chrome/browser/notifications/desktop_notification_service.h" |
| (...skipping 1200 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1269 new NaClBrowserDelegateImpl(browser_process_->profile_manager()); | 1269 new NaClBrowserDelegateImpl(browser_process_->profile_manager()); |
| 1270 nacl::NaClBrowser::SetDelegate(delegate); | 1270 nacl::NaClBrowser::SetDelegate(delegate); |
| 1271 #endif | 1271 #endif |
| 1272 | 1272 |
| 1273 // TODO(stevenjb): Move WIN and MACOSX specific code to appropriate Parts. | 1273 // TODO(stevenjb): Move WIN and MACOSX specific code to appropriate Parts. |
| 1274 // (requires supporting early exit). | 1274 // (requires supporting early exit). |
| 1275 PostProfileInit(); | 1275 PostProfileInit(); |
| 1276 | 1276 |
| 1277 // Retrieve cached GL strings from local state and use them for GPU | 1277 // Retrieve cached GL strings from local state and use them for GPU |
| 1278 // blacklist decisions. | 1278 // blacklist decisions. |
| 1279 if (g_browser_process->gl_string_manager()) | 1279 if (g_browser_process->gpu_pref_manager()) |
| 1280 g_browser_process->gl_string_manager()->Initialize(); | 1280 g_browser_process->gpu_pref_manager()->Initialize(); |
| 1281 | 1281 |
| 1282 // Create an instance of GpuModeManager to watch gpu mode pref change. | 1282 // Create an instance of GpuModeManager to watch gpu mode pref change. |
| 1283 g_browser_process->gpu_mode_manager(); | 1283 g_browser_process->gpu_mode_manager(); |
| 1284 | 1284 |
| 1285 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) | 1285 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS) |
| 1286 // Show the First Run UI if this is the first time Chrome has been run on | 1286 // Show the First Run UI if this is the first time Chrome has been run on |
| 1287 // this computer, or we're being compelled to do so by a command line flag. | 1287 // this computer, or we're being compelled to do so by a command line flag. |
| 1288 // Note that this be done _after_ the PrefService is initialized and all | 1288 // Note that this be done _after_ the PrefService is initialized and all |
| 1289 // preferences are registered, since some of the code that the importer | 1289 // preferences are registered, since some of the code that the importer |
| 1290 // touches reads preferences. | 1290 // touches reads preferences. |
| (...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1663 chromeos::CrosSettings::Shutdown(); | 1663 chromeos::CrosSettings::Shutdown(); |
| 1664 #endif | 1664 #endif |
| 1665 #endif | 1665 #endif |
| 1666 } | 1666 } |
| 1667 | 1667 |
| 1668 // Public members: | 1668 // Public members: |
| 1669 | 1669 |
| 1670 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1670 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1671 chrome_extra_parts_.push_back(parts); | 1671 chrome_extra_parts_.push_back(parts); |
| 1672 } | 1672 } |
| OLD | NEW |