| 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 21 matching lines...) Expand all Loading... |
| 32 #include "chrome/browser/extensions/extension_info_map.h" | 32 #include "chrome/browser/extensions/extension_info_map.h" |
| 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/chrome_webrtc_internals.h" |
| 42 #include "chrome/browser/media/media_internals.h" | 43 #include "chrome/browser/media/media_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" |
| (...skipping 1257 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1309 int render_process_id, | 1310 int render_process_id, |
| 1310 int render_view_id) { | 1311 int render_view_id) { |
| 1311 chrome::SSLAddCertificate(request, cert_type, cert_data, cert_size, | 1312 chrome::SSLAddCertificate(request, cert_type, cert_data, cert_size, |
| 1312 render_process_id, render_view_id); | 1313 render_process_id, render_view_id); |
| 1313 } | 1314 } |
| 1314 | 1315 |
| 1315 content::MediaObserver* ChromeContentBrowserClient::GetMediaObserver() { | 1316 content::MediaObserver* ChromeContentBrowserClient::GetMediaObserver() { |
| 1316 return MediaInternals::GetInstance(); | 1317 return MediaInternals::GetInstance(); |
| 1317 } | 1318 } |
| 1318 | 1319 |
| 1320 content::WebRTCInternals* ChromeContentBrowserClient::GetWebRTCInternals() { |
| 1321 return ChromeWebRTCInternals::GetInstance(); |
| 1322 } |
| 1323 |
| 1319 void ChromeContentBrowserClient::RequestDesktopNotificationPermission( | 1324 void ChromeContentBrowserClient::RequestDesktopNotificationPermission( |
| 1320 const GURL& source_origin, | 1325 const GURL& source_origin, |
| 1321 int callback_context, | 1326 int callback_context, |
| 1322 int render_process_id, | 1327 int render_process_id, |
| 1323 int render_view_id) { | 1328 int render_view_id) { |
| 1324 #if defined(ENABLE_NOTIFICATIONS) | 1329 #if defined(ENABLE_NOTIFICATIONS) |
| 1325 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 1330 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
| 1326 WebContents* contents = | 1331 WebContents* contents = |
| 1327 tab_util::GetWebContentsByID(render_process_id, render_view_id); | 1332 tab_util::GetWebContentsByID(render_process_id, render_view_id); |
| 1328 if (!contents) { | 1333 if (!contents) { |
| (...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1897 io_thread_application_locale_ = locale; | 1902 io_thread_application_locale_ = locale; |
| 1898 } | 1903 } |
| 1899 | 1904 |
| 1900 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( | 1905 void ChromeContentBrowserClient::SetApplicationLocaleOnIOThread( |
| 1901 const std::string& locale) { | 1906 const std::string& locale) { |
| 1902 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 1907 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
| 1903 io_thread_application_locale_ = locale; | 1908 io_thread_application_locale_ = locale; |
| 1904 } | 1909 } |
| 1905 | 1910 |
| 1906 } // namespace chrome | 1911 } // namespace chrome |
| OLD | NEW |