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 22 matching lines...) Expand all Loading... |
33 #include "chrome/browser/extensions/extension_process_manager.h" | 33 #include "chrome/browser/extensions/extension_process_manager.h" |
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/media/media_internals.h" | 42 #include "chrome/browser/media/media_internals.h" |
| 43 #include "chrome/browser/media/webrtc_internals.h" |
43 #include "chrome/browser/nacl_host/nacl_process_host.h" | 44 #include "chrome/browser/nacl_host/nacl_process_host.h" |
44 #include "chrome/browser/net/chrome_net_log.h" | 45 #include "chrome/browser/net/chrome_net_log.h" |
45 #include "chrome/browser/notifications/desktop_notification_service.h" | 46 #include "chrome/browser/notifications/desktop_notification_service.h" |
46 #include "chrome/browser/notifications/desktop_notification_service_factory.h" | 47 #include "chrome/browser/notifications/desktop_notification_service_factory.h" |
47 #include "chrome/browser/platform_util.h" | 48 #include "chrome/browser/platform_util.h" |
48 #include "chrome/browser/plugins/plugin_info_message_filter.h" | 49 #include "chrome/browser/plugins/plugin_info_message_filter.h" |
49 #include "chrome/browser/prefs/pref_service.h" | 50 #include "chrome/browser/prefs/pref_service.h" |
50 #include "chrome/browser/prefs/scoped_user_pref_update.h" | 51 #include "chrome/browser/prefs/scoped_user_pref_update.h" |
51 #include "chrome/browser/prerender/prerender_manager.h" | 52 #include "chrome/browser/prerender/prerender_manager.h" |
52 #include "chrome/browser/prerender/prerender_manager_factory.h" | 53 #include "chrome/browser/prerender/prerender_manager_factory.h" |
(...skipping 1260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1313 int render_process_id, | 1314 int render_process_id, |
1314 int render_view_id) { | 1315 int render_view_id) { |
1315 chrome::SSLAddCertificate(request, cert_type, cert_data, cert_size, | 1316 chrome::SSLAddCertificate(request, cert_type, cert_data, cert_size, |
1316 render_process_id, render_view_id); | 1317 render_process_id, render_view_id); |
1317 } | 1318 } |
1318 | 1319 |
1319 content::MediaObserver* ChromeContentBrowserClient::GetMediaObserver() { | 1320 content::MediaObserver* ChromeContentBrowserClient::GetMediaObserver() { |
1320 return MediaInternals::GetInstance(); | 1321 return MediaInternals::GetInstance(); |
1321 } | 1322 } |
1322 | 1323 |
| 1324 content::WebRTCInternalsInterface* |
| 1325 ChromeContentBrowserClient::GetWebRTCInternalsInterface() { |
| 1326 return media::WebRTCInternals::GetInstance(); |
| 1327 } |
| 1328 |
1323 void ChromeContentBrowserClient::RequestDesktopNotificationPermission( | 1329 void ChromeContentBrowserClient::RequestDesktopNotificationPermission( |
1324 const GURL& source_origin, | 1330 const GURL& source_origin, |
1325 int callback_context, | 1331 int callback_context, |
1326 int render_process_id, | 1332 int render_process_id, |
1327 int render_view_id) { | 1333 int render_view_id) { |
1328 #if defined(ENABLE_NOTIFICATIONS) | 1334 #if defined(ENABLE_NOTIFICATIONS) |
1329 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 1335 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
1330 WebContents* contents = | 1336 WebContents* contents = |
1331 tab_util::GetWebContentsByID(render_process_id, render_view_id); | 1337 tab_util::GetWebContentsByID(render_process_id, render_view_id); |
1332 if (!contents) { | 1338 if (!contents) { |
(...skipping 575 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1908 io_thread_application_locale_ = locale; | 1914 io_thread_application_locale_ = locale; |
1909 } | 1915 } |
1910 | 1916 |
1911 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( | 1917 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( |
1912 const std::string& locale) { | 1918 const std::string& locale) { |
1913 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 1919 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
1914 io_thread_application_locale_ = locale; | 1920 io_thread_application_locale_ = locale; |
1915 } | 1921 } |
1916 | 1922 |
1917 } // namespace chrome | 1923 } // namespace chrome |
OLD | NEW |