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 23 matching lines...) Expand all Loading... |
34 #include "chrome/browser/extensions/extension_service.h" | 34 #include "chrome/browser/extensions/extension_service.h" |
35 #include "chrome/browser/extensions/extension_system.h" | 35 #include "chrome/browser/extensions/extension_system.h" |
36 #include "chrome/browser/extensions/extension_web_ui.h" | 36 #include "chrome/browser/extensions/extension_web_ui.h" |
37 #include "chrome/browser/extensions/extension_webkit_preferences.h" | 37 #include "chrome/browser/extensions/extension_webkit_preferences.h" |
38 #include "chrome/browser/extensions/message_handler.h" | 38 #include "chrome/browser/extensions/message_handler.h" |
39 #include "chrome/browser/extensions/suggest_permission_util.h" | 39 #include "chrome/browser/extensions/suggest_permission_util.h" |
40 #include "chrome/browser/geolocation/chrome_access_token_store.h" | 40 #include "chrome/browser/geolocation/chrome_access_token_store.h" |
41 #include "chrome/browser/google/google_util.h" | 41 #include "chrome/browser/google/google_util.h" |
42 #include "chrome/browser/instant/instant_service.h" | 42 #include "chrome/browser/instant/instant_service.h" |
43 #include "chrome/browser/instant/instant_service_factory.h" | 43 #include "chrome/browser/instant/instant_service_factory.h" |
44 #include "chrome/browser/media/media_internals.h" | 44 #include "chrome/browser/media/media_capture_devices_dispatcher.h" |
45 #include "chrome/browser/nacl_host/nacl_process_host.h" | 45 #include "chrome/browser/nacl_host/nacl_process_host.h" |
46 #include "chrome/browser/net/chrome_net_log.h" | 46 #include "chrome/browser/net/chrome_net_log.h" |
47 #include "chrome/browser/notifications/desktop_notification_service.h" | 47 #include "chrome/browser/notifications/desktop_notification_service.h" |
48 #include "chrome/browser/notifications/desktop_notification_service_factory.h" | 48 #include "chrome/browser/notifications/desktop_notification_service_factory.h" |
49 #include "chrome/browser/platform_util.h" | 49 #include "chrome/browser/platform_util.h" |
50 #include "chrome/browser/plugins/plugin_info_message_filter.h" | 50 #include "chrome/browser/plugins/plugin_info_message_filter.h" |
51 #include "chrome/browser/prefs/pref_service.h" | 51 #include "chrome/browser/prefs/pref_service.h" |
52 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 52 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
53 #include "chrome/browser/prerender/prerender_manager.h" | 53 #include "chrome/browser/prerender/prerender_manager.h" |
54 #include "chrome/browser/prerender/prerender_manager_factory.h" | 54 #include "chrome/browser/prerender/prerender_manager_factory.h" |
(...skipping 1391 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1446 net::CertificateMimeType cert_type, | 1446 net::CertificateMimeType cert_type, |
1447 const void* cert_data, | 1447 const void* cert_data, |
1448 size_t cert_size, | 1448 size_t cert_size, |
1449 int render_process_id, | 1449 int render_process_id, |
1450 int render_view_id) { | 1450 int render_view_id) { |
1451 chrome::SSLAddCertificate(request, cert_type, cert_data, cert_size, | 1451 chrome::SSLAddCertificate(request, cert_type, cert_data, cert_size, |
1452 render_process_id, render_view_id); | 1452 render_process_id, render_view_id); |
1453 } | 1453 } |
1454 | 1454 |
1455 content::MediaObserver* ChromeContentBrowserClient::GetMediaObserver() { | 1455 content::MediaObserver* ChromeContentBrowserClient::GetMediaObserver() { |
1456 return MediaInternals::GetInstance(); | 1456 return MediaCaptureDevicesDispatcher::GetInstance(); |
1457 } | 1457 } |
1458 | 1458 |
1459 void ChromeContentBrowserClient::RequestDesktopNotificationPermission( | 1459 void ChromeContentBrowserClient::RequestDesktopNotificationPermission( |
1460 const GURL& source_origin, | 1460 const GURL& source_origin, |
1461 int callback_context, | 1461 int callback_context, |
1462 int render_process_id, | 1462 int render_process_id, |
1463 int render_view_id) { | 1463 int render_view_id) { |
1464 #if defined(ENABLE_NOTIFICATIONS) | 1464 #if defined(ENABLE_NOTIFICATIONS) |
1465 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 1465 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
1466 WebContents* contents = | 1466 WebContents* contents = |
(...skipping 579 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2046 io_thread_application_locale_ = locale; | 2046 io_thread_application_locale_ = locale; |
2047 } | 2047 } |
2048 | 2048 |
2049 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( | 2049 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( |
2050 const std::string& locale) { | 2050 const std::string& locale) { |
2051 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 2051 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
2052 io_thread_application_locale_ = locale; | 2052 io_thread_application_locale_ = locale; |
2053 } | 2053 } |
2054 | 2054 |
2055 } // namespace chrome | 2055 } // namespace chrome |
OLD | NEW |