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 1299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1517 rlz::RLZTracker::InitRlzDelayed( | 1519 rlz::RLZTracker::InitRlzDelayed( |
1518 first_run::IsChromeFirstRun(), ping_delay < 0, | 1520 first_run::IsChromeFirstRun(), ping_delay < 0, |
1519 base::TimeDelta::FromMilliseconds(abs(ping_delay)), | 1521 base::TimeDelta::FromMilliseconds(abs(ping_delay)), |
1520 ChromeRLZTrackerDelegate::IsGoogleDefaultSearch(profile_), | 1522 ChromeRLZTrackerDelegate::IsGoogleDefaultSearch(profile_), |
1521 ChromeRLZTrackerDelegate::IsGoogleHomepage(profile_), | 1523 ChromeRLZTrackerDelegate::IsGoogleHomepage(profile_), |
1522 ChromeRLZTrackerDelegate::IsGoogleInStartpages(profile_)); | 1524 ChromeRLZTrackerDelegate::IsGoogleInStartpages(profile_)); |
1523 #endif // defined(ENABLE_RLZ) && !defined(OS_CHROMEOS) | 1525 #endif // defined(ENABLE_RLZ) && !defined(OS_CHROMEOS) |
1524 | 1526 |
1525 // Configure modules that need access to resources. | 1527 // Configure modules that need access to resources. |
1526 net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider); | 1528 net::NetModule::SetResourceProvider(chrome_common_net::NetResourceProvider); |
| 1529 #if !defined(OS_IOS) |
| 1530 media::SetLocalizedStringProvider( |
| 1531 chrome_common_media::LocalizedStringProvider); |
| 1532 #endif |
1527 | 1533 |
1528 // In unittest mode, this will do nothing. In normal mode, this will create | 1534 // In unittest mode, this will do nothing. In normal mode, this will create |
1529 // the global IntranetRedirectDetector instance, which will promptly go to | 1535 // the global IntranetRedirectDetector instance, which will promptly go to |
1530 // sleep for seven seconds (to avoid slowing startup), and wake up afterwards | 1536 // sleep for seven seconds (to avoid slowing startup), and wake up afterwards |
1531 // to see if it should do anything else. | 1537 // to see if it should do anything else. |
1532 // | 1538 // |
1533 // A simpler way of doing all this would be to have some function which could | 1539 // A simpler way of doing all this would be to have some function which could |
1534 // give the time elapsed since startup, and simply have this object check that | 1540 // give the time elapsed since startup, and simply have this object check that |
1535 // when asked to initialize itself, but this doesn't seem to exist. | 1541 // when asked to initialize itself, but this doesn't seem to exist. |
1536 // | 1542 // |
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1836 chromeos::CrosSettings::Shutdown(); | 1842 chromeos::CrosSettings::Shutdown(); |
1837 #endif // defined(OS_CHROMEOS) | 1843 #endif // defined(OS_CHROMEOS) |
1838 #endif // defined(OS_ANDROID) | 1844 #endif // defined(OS_ANDROID) |
1839 } | 1845 } |
1840 | 1846 |
1841 // Public members: | 1847 // Public members: |
1842 | 1848 |
1843 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1849 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1844 chrome_extra_parts_.push_back(parts); | 1850 chrome_extra_parts_.push_back(parts); |
1845 } | 1851 } |
OLD | NEW |