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_content_browser_client.h" | 5 #include "chrome/browser/chrome_content_browser_client.h" |
6 | 6 |
7 #include <set> | 7 #include <set> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
51 #include "chrome/browser/notifications/desktop_notification_service.h" | 51 #include "chrome/browser/notifications/desktop_notification_service.h" |
52 #include "chrome/browser/notifications/desktop_notification_service_factory.h" | 52 #include "chrome/browser/notifications/desktop_notification_service_factory.h" |
53 #include "chrome/browser/platform_util.h" | 53 #include "chrome/browser/platform_util.h" |
54 #include "chrome/browser/plugins/plugin_info_message_filter.h" | 54 #include "chrome/browser/plugins/plugin_info_message_filter.h" |
55 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 55 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
56 #include "chrome/browser/prerender/prerender_manager.h" | 56 #include "chrome/browser/prerender/prerender_manager.h" |
57 #include "chrome/browser/prerender/prerender_manager_factory.h" | 57 #include "chrome/browser/prerender/prerender_manager_factory.h" |
58 #include "chrome/browser/prerender/prerender_message_filter.h" | 58 #include "chrome/browser/prerender/prerender_message_filter.h" |
59 #include "chrome/browser/prerender/prerender_tracker.h" | 59 #include "chrome/browser/prerender/prerender_tracker.h" |
60 #include "chrome/browser/printing/printing_message_filter.h" | 60 #include "chrome/browser/printing/printing_message_filter.h" |
| 61 #include "chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.h" |
61 #include "chrome/browser/profiles/profile.h" | 62 #include "chrome/browser/profiles/profile.h" |
62 #include "chrome/browser/profiles/profile_io_data.h" | 63 #include "chrome/browser/profiles/profile_io_data.h" |
63 #include "chrome/browser/profiles/profile_manager.h" | 64 #include "chrome/browser/profiles/profile_manager.h" |
64 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" | 65 #include "chrome/browser/renderer_host/chrome_render_message_filter.h" |
65 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory
.h" | 66 #include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory
.h" |
66 #include "chrome/browser/search/instant_service.h" | 67 #include "chrome/browser/search/instant_service.h" |
67 #include "chrome/browser/search/instant_service_factory.h" | 68 #include "chrome/browser/search/instant_service_factory.h" |
68 #include "chrome/browser/search/search.h" | 69 #include "chrome/browser/search/search.h" |
69 #include "chrome/browser/search_engines/search_provider_install_state_message_fi
lter.h" | 70 #include "chrome/browser/search_engines/search_provider_install_state_message_fi
lter.h" |
70 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" | 71 #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h" |
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
535 main_parts = new ChromeBrowserMainPartsLinux(parameters); | 536 main_parts = new ChromeBrowserMainPartsLinux(parameters); |
536 #elif defined(OS_ANDROID) | 537 #elif defined(OS_ANDROID) |
537 main_parts = new ChromeBrowserMainPartsAndroid(parameters); | 538 main_parts = new ChromeBrowserMainPartsAndroid(parameters); |
538 #elif defined(OS_POSIX) | 539 #elif defined(OS_POSIX) |
539 main_parts = new ChromeBrowserMainPartsPosix(parameters); | 540 main_parts = new ChromeBrowserMainPartsPosix(parameters); |
540 #else | 541 #else |
541 NOTREACHED(); | 542 NOTREACHED(); |
542 main_parts = new ChromeBrowserMainParts(parameters); | 543 main_parts = new ChromeBrowserMainParts(parameters); |
543 #endif | 544 #endif |
544 | 545 |
| 546 chrome::AddProfilesExtraParts(main_parts); |
| 547 |
545 // Construct additional browser parts. Stages are called in the order in | 548 // Construct additional browser parts. Stages are called in the order in |
546 // which they are added. | 549 // which they are added. |
547 #if defined(TOOLKIT_GTK) | 550 #if defined(TOOLKIT_GTK) |
548 chrome::AddGtkToolkitExtraParts(main_parts); | 551 chrome::AddGtkToolkitExtraParts(main_parts); |
549 #endif | 552 #endif |
550 | 553 |
551 #if defined(TOOLKIT_VIEWS) | 554 #if defined(TOOLKIT_VIEWS) |
552 chrome::AddViewsToolkitExtraParts(main_parts); | 555 chrome::AddViewsToolkitExtraParts(main_parts); |
553 #endif | 556 #endif |
554 | 557 |
(...skipping 1733 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2288 #if defined(USE_NSS) | 2291 #if defined(USE_NSS) |
2289 crypto::CryptoModuleBlockingPasswordDelegate* | 2292 crypto::CryptoModuleBlockingPasswordDelegate* |
2290 ChromeContentBrowserClient::GetCryptoPasswordDelegate( | 2293 ChromeContentBrowserClient::GetCryptoPasswordDelegate( |
2291 const GURL& url) { | 2294 const GURL& url) { |
2292 return chrome::NewCryptoModuleBlockingDialogDelegate( | 2295 return chrome::NewCryptoModuleBlockingDialogDelegate( |
2293 chrome::kCryptoModulePasswordKeygen, url.host()); | 2296 chrome::kCryptoModulePasswordKeygen, url.host()); |
2294 } | 2297 } |
2295 #endif | 2298 #endif |
2296 | 2299 |
2297 } // namespace chrome | 2300 } // namespace chrome |
OLD | NEW |