Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(112)

Side by Side Diff: trunk/src/content/renderer/renderer_webkitplatformsupport_impl.cc

Issue 192283002: Revert 255858 "Simplify the user agent code some more since afte..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "content/renderer/renderer_webkitplatformsupport_impl.h" 5 #include "content/renderer/renderer_webkitplatformsupport_impl.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/lazy_instance.h" 9 #include "base/lazy_instance.h"
10 #include "base/memory/shared_memory.h" 10 #include "base/memory/shared_memory.h"
(...skipping 894 matching lines...) Expand 10 before | Expand all | Expand 10 after
905 //------------------------------------------------------------------------------ 905 //------------------------------------------------------------------------------
906 906
907 void RendererWebKitPlatformSupportImpl::sampleGamepads(WebGamepads& gamepads) { 907 void RendererWebKitPlatformSupportImpl::sampleGamepads(WebGamepads& gamepads) {
908 if (g_test_gamepads == 0) { 908 if (g_test_gamepads == 0) {
909 RenderThreadImpl::current()->SampleGamepads(&gamepads); 909 RenderThreadImpl::current()->SampleGamepads(&gamepads);
910 } else { 910 } else {
911 gamepads = g_test_gamepads.Get(); 911 gamepads = g_test_gamepads.Get();
912 } 912 }
913 } 913 }
914 914
915 blink::WebString RendererWebKitPlatformSupportImpl::userAgent(
916 const blink::WebURL& url) {
917 return WebKitPlatformSupportImpl::userAgent(url);
918 }
919
915 //------------------------------------------------------------------------------ 920 //------------------------------------------------------------------------------
916 921
917 WebRTCPeerConnectionHandler* 922 WebRTCPeerConnectionHandler*
918 RendererWebKitPlatformSupportImpl::createRTCPeerConnectionHandler( 923 RendererWebKitPlatformSupportImpl::createRTCPeerConnectionHandler(
919 WebRTCPeerConnectionHandlerClient* client) { 924 WebRTCPeerConnectionHandlerClient* client) {
920 RenderThreadImpl* render_thread = RenderThreadImpl::current(); 925 RenderThreadImpl* render_thread = RenderThreadImpl::current();
921 DCHECK(render_thread); 926 DCHECK(render_thread);
922 if (!render_thread) 927 if (!render_thread)
923 return NULL; 928 return NULL;
924 929
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
1140 return; 1145 return;
1141 QuotaDispatcher::ThreadSpecificInstance( 1146 QuotaDispatcher::ThreadSpecificInstance(
1142 thread_safe_sender_.get(), 1147 thread_safe_sender_.get(),
1143 quota_message_filter_.get())->QueryStorageUsageAndQuota( 1148 quota_message_filter_.get())->QueryStorageUsageAndQuota(
1144 storage_partition, 1149 storage_partition,
1145 static_cast<quota::StorageType>(type), 1150 static_cast<quota::StorageType>(type),
1146 QuotaDispatcher::CreateWebStorageQuotaCallbacksWrapper(callbacks)); 1151 QuotaDispatcher::CreateWebStorageQuotaCallbacksWrapper(callbacks));
1147 } 1152 }
1148 1153
1149 } // namespace content 1154 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698