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

Side by Side Diff: content/child/blink_platform_impl.cc

Issue 2589493006: Revert of Enable connection to Mojo services from Blink (Closed)
Patch Set: Created 4 years 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/child/blink_platform_impl.h" 5 #include "content/child/blink_platform_impl.h"
6 6
7 #include <math.h> 7 #include <math.h>
8 8
9 #include <memory> 9 #include <memory>
10 #include <vector> 10 #include <vector>
(...skipping 30 matching lines...) Expand all
41 #include "content/child/content_child_helpers.h" 41 #include "content/child/content_child_helpers.h"
42 #include "content/child/notifications/notification_dispatcher.h" 42 #include "content/child/notifications/notification_dispatcher.h"
43 #include "content/child/notifications/notification_manager.h" 43 #include "content/child/notifications/notification_manager.h"
44 #include "content/child/push_messaging/push_dispatcher.h" 44 #include "content/child/push_messaging/push_dispatcher.h"
45 #include "content/child/push_messaging/push_provider.h" 45 #include "content/child/push_messaging/push_provider.h"
46 #include "content/child/thread_safe_sender.h" 46 #include "content/child/thread_safe_sender.h"
47 #include "content/child/web_url_loader_impl.h" 47 #include "content/child/web_url_loader_impl.h"
48 #include "content/child/web_url_request_util.h" 48 #include "content/child/web_url_request_util.h"
49 #include "content/child/worker_thread_registry.h" 49 #include "content/child/worker_thread_registry.h"
50 #include "content/public/common/content_client.h" 50 #include "content/public/common/content_client.h"
51 #include "content/public/common/service_manager_connection.h"
52 #include "net/base/net_errors.h" 51 #include "net/base/net_errors.h"
53 #include "services/service_manager/public/cpp/connector.h"
54 #include "services/service_manager/public/interfaces/connector.mojom.h"
55 #include "third_party/WebKit/public/platform/WebData.h" 52 #include "third_party/WebKit/public/platform/WebData.h"
56 #include "third_party/WebKit/public/platform/WebFloatPoint.h" 53 #include "third_party/WebKit/public/platform/WebFloatPoint.h"
57 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h" 54 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
58 #include "third_party/WebKit/public/platform/WebString.h" 55 #include "third_party/WebKit/public/platform/WebString.h"
59 #include "third_party/WebKit/public/platform/WebURL.h" 56 #include "third_party/WebKit/public/platform/WebURL.h"
60 #include "third_party/WebKit/public/platform/scheduler/child/webthread_impl_for_ worker_scheduler.h" 57 #include "third_party/WebKit/public/platform/scheduler/child/webthread_impl_for_ worker_scheduler.h"
61 #include "ui/base/layout.h" 58 #include "ui/base/layout.h"
62 #include "ui/events/gestures/blink/web_gesture_curve_impl.h" 59 #include "ui/events/gestures/blink/web_gesture_curve_impl.h"
63 #include "ui/events/keycodes/dom/keycode_converter.h" 60 #include "ui/events/keycodes/dom/keycode_converter.h"
64 61
65 using blink::WebData; 62 using blink::WebData;
66 using blink::WebFallbackThemeEngine; 63 using blink::WebFallbackThemeEngine;
67 using blink::WebLocalizedString; 64 using blink::WebLocalizedString;
68 using blink::WebString; 65 using blink::WebString;
69 using blink::WebThemeEngine; 66 using blink::WebThemeEngine;
70 using blink::WebURL; 67 using blink::WebURL;
71 using blink::WebURLError; 68 using blink::WebURLError;
72 using blink::WebURLLoader; 69 using blink::WebURLLoader;
73 using blink::scheduler::WebThreadImplForWorkerScheduler; 70 using blink::scheduler::WebThreadImplForWorkerScheduler;
74 71
75 namespace content { 72 namespace content {
76 73
74 namespace {
75
76
77 } // namespace
78
77 static int ToMessageID(WebLocalizedString::Name name) { 79 static int ToMessageID(WebLocalizedString::Name name) {
78 switch (name) { 80 switch (name) {
79 case WebLocalizedString::AXAMPMFieldText: 81 case WebLocalizedString::AXAMPMFieldText:
80 return IDS_AX_AM_PM_FIELD_TEXT; 82 return IDS_AX_AM_PM_FIELD_TEXT;
81 case WebLocalizedString::AXCalendarShowMonthSelector: 83 case WebLocalizedString::AXCalendarShowMonthSelector:
82 return IDS_AX_CALENDAR_SHOW_MONTH_SELECTOR; 84 return IDS_AX_CALENDAR_SHOW_MONTH_SELECTOR;
83 case WebLocalizedString::AXCalendarShowNextMonth: 85 case WebLocalizedString::AXCalendarShowNextMonth:
84 return IDS_AX_CALENDAR_SHOW_NEXT_MONTH; 86 return IDS_AX_CALENDAR_SHOW_NEXT_MONTH;
85 case WebLocalizedString::AXCalendarShowPreviousMonth: 87 case WebLocalizedString::AXCalendarShowPreviousMonth:
86 return IDS_AX_CALENDAR_SHOW_PREVIOUS_MONTH; 88 return IDS_AX_CALENDAR_SHOW_PREVIOUS_MONTH;
(...skipping 694 matching lines...) Expand 10 before | Expand all | Expand 10 after
781 long long BlinkPlatformImpl::databaseGetSpaceAvailableForOrigin( 783 long long BlinkPlatformImpl::databaseGetSpaceAvailableForOrigin(
782 const blink::WebSecurityOrigin& origin) { 784 const blink::WebSecurityOrigin& origin) {
783 return 0; 785 return 0;
784 } 786 }
785 787
786 bool BlinkPlatformImpl::databaseSetFileSize( 788 bool BlinkPlatformImpl::databaseSetFileSize(
787 const blink::WebString& vfs_file_name, long long size) { 789 const blink::WebString& vfs_file_name, long long size) {
788 return false; 790 return false;
789 } 791 }
790 792
791 void BlinkPlatformImpl::bindServiceConnector(
792 service_manager::mojom::blink::ConnectorRequest request) {
793 if (!ChildThreadImpl::current())
794 return;
795
796 service_manager::mojom::ConnectorRequest chromium_request;
797 chromium_request.Bind(request.PassMessagePipe());
798 ChildThreadImpl::current()
799 ->GetServiceManagerConnection()
800 ->GetConnector()
801 ->BindRequest(std::move(chromium_request));
802 }
803
804 blink::WebString BlinkPlatformImpl::signedPublicKeyAndChallengeString( 793 blink::WebString BlinkPlatformImpl::signedPublicKeyAndChallengeString(
805 unsigned key_size_index, 794 unsigned key_size_index,
806 const blink::WebString& challenge, 795 const blink::WebString& challenge,
807 const blink::WebURL& url, 796 const blink::WebURL& url,
808 const blink::WebURL& top_origin) { 797 const blink::WebURL& top_origin) {
809 return blink::WebString(""); 798 return blink::WebString("");
810 } 799 }
811 800
812 size_t BlinkPlatformImpl::actualMemoryUsageMB() { 801 size_t BlinkPlatformImpl::actualMemoryUsageMB() {
813 return GetMemoryUsageKB() >> 10; 802 return GetMemoryUsageKB() >> 10;
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after
862 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString( 851 return WebString::fromUTF8(ui::KeycodeConverter::DomKeyToKeyString(
863 static_cast<ui::DomKey>(dom_key))); 852 static_cast<ui::DomKey>(dom_key)));
864 } 853 }
865 854
866 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) { 855 int BlinkPlatformImpl::domKeyEnumFromString(const WebString& key_string) {
867 return static_cast<int>( 856 return static_cast<int>(
868 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8())); 857 ui::KeycodeConverter::KeyStringToDomKey(key_string.utf8()));
869 } 858 }
870 859
871 } // namespace content 860 } // namespace content
OLDNEW
« no previous file with comments | « content/child/blink_platform_impl.h ('k') | content/public/app/mojo/content_renderer_manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698