| 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 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 | 198 |
| 199 #if defined(OS_MACOSX) | 199 #if defined(OS_MACOSX) |
| 200 #include <Security/Security.h> | 200 #include <Security/Security.h> |
| 201 | 201 |
| 202 #include "base/mac/scoped_nsautorelease_pool.h" | 202 #include "base/mac/scoped_nsautorelease_pool.h" |
| 203 #include "chrome/browser/mac/keystone_glue.h" | 203 #include "chrome/browser/mac/keystone_glue.h" |
| 204 #endif // defined(OS_MACOSX) | 204 #endif // defined(OS_MACOSX) |
| 205 | 205 |
| 206 #if !defined(OS_IOS) | 206 #if !defined(OS_IOS) |
| 207 #include "chrome/browser/ui/app_modal/chrome_javascript_native_dialog_factory.h" | 207 #include "chrome/browser/ui/app_modal/chrome_javascript_native_dialog_factory.h" |
| 208 #include "chrome/common/media/media_resource_provider.h" |
| 209 #include "media/base/media_resources.h" |
| 208 #endif // !defined(OS_IOS) | 210 #endif // !defined(OS_IOS) |
| 209 | 211 |
| 210 #if !defined(DISABLE_NACL) | 212 #if !defined(DISABLE_NACL) |
| 211 #include "chrome/browser/component_updater/pnacl_component_installer.h" | 213 #include "chrome/browser/component_updater/pnacl_component_installer.h" |
| 212 #include "components/nacl/browser/nacl_process_host.h" | 214 #include "components/nacl/browser/nacl_process_host.h" |
| 213 #endif // !defined(DISABLE_NACL) | 215 #endif // !defined(DISABLE_NACL) |
| 214 | 216 |
| 215 #if defined(ENABLE_EXTENSIONS) | 217 #if defined(ENABLE_EXTENSIONS) |
| 216 #include "chrome/browser/extensions/startup_helper.h" | 218 #include "chrome/browser/extensions/startup_helper.h" |
| 217 #include "extensions/browser/extension_protocols.h" | 219 #include "extensions/browser/extension_protocols.h" |
| (...skipping 1298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1516 rlz::RLZTracker::InitRlzDelayed( | 1518 rlz::RLZTracker::InitRlzDelayed( |
| 1517 first_run::IsChromeFirstRun(), ping_delay < 0, | 1519 first_run::IsChromeFirstRun(), ping_delay < 0, |
| 1518 base::TimeDelta::FromMilliseconds(abs(ping_delay)), | 1520 base::TimeDelta::FromMilliseconds(abs(ping_delay)), |
| 1519 ChromeRLZTrackerDelegate::IsGoogleDefaultSearch(profile_), | 1521 ChromeRLZTrackerDelegate::IsGoogleDefaultSearch(profile_), |
| 1520 ChromeRLZTrackerDelegate::IsGoogleHomepage(profile_), | 1522 ChromeRLZTrackerDelegate::IsGoogleHomepage(profile_), |
| 1521 ChromeRLZTrackerDelegate::IsGoogleInStartpages(profile_)); | 1523 ChromeRLZTrackerDelegate::IsGoogleInStartpages(profile_)); |
| 1522 #endif // defined(ENABLE_RLZ) && !defined(OS_CHROMEOS) | 1524 #endif // defined(ENABLE_RLZ) && !defined(OS_CHROMEOS) |
| 1523 | 1525 |
| 1524 // Configure modules that need access to resources. | 1526 // Configure modules that need access to resources. |
| 1525 net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider); | 1527 net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider); |
| 1528 #if !defined(OS_IOS) |
| 1529 media::SetLocalizedStringProvider( |
| 1530 chrome_common_media::LocalizedStringProvider); |
| 1531 #endif |
| 1526 | 1532 |
| 1527 // In unittest mode, this will do nothing. In normal mode, this will create | 1533 // In unittest mode, this will do nothing. In normal mode, this will create |
| 1528 // the global IntranetRedirectDetector instance, which will promptly go to | 1534 // the global IntranetRedirectDetector instance, which will promptly go to |
| 1529 // sleep for seven seconds (to avoid slowing startup), and wake up afterwards | 1535 // sleep for seven seconds (to avoid slowing startup), and wake up afterwards |
| 1530 // to see if it should do anything else. | 1536 // to see if it should do anything else. |
| 1531 // | 1537 // |
| 1532 // A simpler way of doing all this would be to have some function which could | 1538 // A simpler way of doing all this would be to have some function which could |
| 1533 // give the time elapsed since startup, and simply have this object check that | 1539 // give the time elapsed since startup, and simply have this object check that |
| 1534 // when asked to initialize itself, but this doesn't seem to exist. | 1540 // when asked to initialize itself, but this doesn't seem to exist. |
| 1535 // | 1541 // |
| (...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1835 chromeos::CrosSettings::Shutdown(); | 1841 chromeos::CrosSettings::Shutdown(); |
| 1836 #endif // defined(OS_CHROMEOS) | 1842 #endif // defined(OS_CHROMEOS) |
| 1837 #endif // defined(OS_ANDROID) | 1843 #endif // defined(OS_ANDROID) |
| 1838 } | 1844 } |
| 1839 | 1845 |
| 1840 // Public members: | 1846 // Public members: |
| 1841 | 1847 |
| 1842 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1848 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
| 1843 chrome_extra_parts_.push_back(parts); | 1849 chrome_extra_parts_.push_back(parts); |
| 1844 } | 1850 } |
| OLD | NEW |