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

Side by Side Diff: third_party/WebKit/Source/web/ChromeClientImpl.cpp

Issue 2863693003: Unify TouchAction classes (Closed)
Patch Set: add cstdlib Created 3 years, 7 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 #include "platform/Cursor.h" 67 #include "platform/Cursor.h"
68 #include "platform/FileChooser.h" 68 #include "platform/FileChooser.h"
69 #include "platform/Histogram.h" 69 #include "platform/Histogram.h"
70 #include "platform/KeyboardCodes.h" 70 #include "platform/KeyboardCodes.h"
71 #include "platform/RuntimeEnabledFeatures.h" 71 #include "platform/RuntimeEnabledFeatures.h"
72 #include "platform/WebFrameScheduler.h" 72 #include "platform/WebFrameScheduler.h"
73 #include "platform/animation/CompositorAnimationHost.h" 73 #include "platform/animation/CompositorAnimationHost.h"
74 #include "platform/exported/WrappedResourceRequest.h" 74 #include "platform/exported/WrappedResourceRequest.h"
75 #include "platform/geometry/IntRect.h" 75 #include "platform/geometry/IntRect.h"
76 #include "platform/graphics/GraphicsLayer.h" 76 #include "platform/graphics/GraphicsLayer.h"
77 #include "platform/graphics/TouchAction.h"
77 #include "platform/scheduler/renderer/web_view_scheduler.h" 78 #include "platform/scheduler/renderer/web_view_scheduler.h"
78 #include "platform/weborigin/SecurityOrigin.h" 79 #include "platform/weborigin/SecurityOrigin.h"
79 #include "platform/wtf/Optional.h" 80 #include "platform/wtf/Optional.h"
80 #include "platform/wtf/PtrUtil.h" 81 #include "platform/wtf/PtrUtil.h"
81 #include "platform/wtf/text/CString.h" 82 #include "platform/wtf/text/CString.h"
82 #include "platform/wtf/text/CharacterNames.h" 83 #include "platform/wtf/text/CharacterNames.h"
83 #include "platform/wtf/text/StringBuilder.h" 84 #include "platform/wtf/text/StringBuilder.h"
84 #include "platform/wtf/text/StringConcatenate.h" 85 #include "platform/wtf/text/StringConcatenate.h"
85 #include "public/platform/WebCursorInfo.h" 86 #include "public/platform/WebCursorInfo.h"
86 #include "public/platform/WebFloatRect.h" 87 #include "public/platform/WebFloatRect.h"
87 #include "public/platform/WebInputEvent.h" 88 #include "public/platform/WebInputEvent.h"
88 #include "public/platform/WebRect.h" 89 #include "public/platform/WebRect.h"
89 #include "public/platform/WebURLRequest.h" 90 #include "public/platform/WebURLRequest.h"
90 #include "public/web/WebAXObject.h" 91 #include "public/web/WebAXObject.h"
91 #include "public/web/WebAutofillClient.h" 92 #include "public/web/WebAutofillClient.h"
92 #include "public/web/WebColorChooser.h" 93 #include "public/web/WebColorChooser.h"
93 #include "public/web/WebColorSuggestion.h" 94 #include "public/web/WebColorSuggestion.h"
94 #include "public/web/WebConsoleMessage.h" 95 #include "public/web/WebConsoleMessage.h"
95 #include "public/web/WebFrameClient.h" 96 #include "public/web/WebFrameClient.h"
96 #include "public/web/WebInputElement.h" 97 #include "public/web/WebInputElement.h"
97 #include "public/web/WebKit.h" 98 #include "public/web/WebKit.h"
98 #include "public/web/WebNode.h" 99 #include "public/web/WebNode.h"
99 #include "public/web/WebPageImportanceSignals.h" 100 #include "public/web/WebPageImportanceSignals.h"
100 #include "public/web/WebPlugin.h" 101 #include "public/web/WebPlugin.h"
101 #include "public/web/WebPopupMenuInfo.h" 102 #include "public/web/WebPopupMenuInfo.h"
102 #include "public/web/WebSelection.h" 103 #include "public/web/WebSelection.h"
103 #include "public/web/WebSettings.h" 104 #include "public/web/WebSettings.h"
104 #include "public/web/WebTextDirection.h" 105 #include "public/web/WebTextDirection.h"
105 #include "public/web/WebTouchAction.h"
106 #include "public/web/WebUserGestureIndicator.h" 106 #include "public/web/WebUserGestureIndicator.h"
107 #include "public/web/WebUserGestureToken.h" 107 #include "public/web/WebUserGestureToken.h"
108 #include "public/web/WebViewClient.h" 108 #include "public/web/WebViewClient.h"
109 #include "public/web/WebWindowFeatures.h" 109 #include "public/web/WebWindowFeatures.h"
110 #include "web/AudioOutputDeviceClientImpl.h" 110 #include "web/AudioOutputDeviceClientImpl.h"
111 #include "web/ColorChooserPopupUIController.h" 111 #include "web/ColorChooserPopupUIController.h"
112 #include "web/ColorChooserUIController.h" 112 #include "web/ColorChooserUIController.h"
113 #include "web/DateTimeChooserImpl.h" 113 #include "web/DateTimeChooserImpl.h"
114 #include "web/DevToolsEmulator.h" 114 #include "web/DevToolsEmulator.h"
115 #include "web/ExternalDateTimeChooser.h" 115 #include "web/ExternalDateTimeChooser.h"
(...skipping 934 matching lines...) Expand 10 before | Expand all | Expand 10 after
1050 1050
1051 void ChromeClientImpl::SetTouchAction(LocalFrame* frame, 1051 void ChromeClientImpl::SetTouchAction(LocalFrame* frame,
1052 TouchAction touch_action) { 1052 TouchAction touch_action) {
1053 DCHECK(frame); 1053 DCHECK(frame);
1054 WebLocalFrameImpl* web_frame = WebLocalFrameImpl::FromFrame(frame); 1054 WebLocalFrameImpl* web_frame = WebLocalFrameImpl::FromFrame(frame);
1055 WebFrameWidgetBase* widget = web_frame->LocalRoot()->FrameWidget(); 1055 WebFrameWidgetBase* widget = web_frame->LocalRoot()->FrameWidget();
1056 if (!widget) 1056 if (!widget)
1057 return; 1057 return;
1058 1058
1059 if (WebWidgetClient* client = widget->Client()) 1059 if (WebWidgetClient* client = widget->Client())
1060 client->SetTouchAction(static_cast<WebTouchAction>(touch_action)); 1060 client->SetTouchAction(static_cast<TouchAction>(touch_action));
1061 } 1061 }
1062 1062
1063 bool ChromeClientImpl::RequestPointerLock(LocalFrame* frame) { 1063 bool ChromeClientImpl::RequestPointerLock(LocalFrame* frame) {
1064 LocalFrame& local_root = frame->LocalFrameRoot(); 1064 LocalFrame& local_root = frame->LocalFrameRoot();
1065 return WebLocalFrameImpl::FromFrame(&local_root) 1065 return WebLocalFrameImpl::FromFrame(&local_root)
1066 ->FrameWidget() 1066 ->FrameWidget()
1067 ->Client() 1067 ->Client()
1068 ->RequestPointerLock(); 1068 ->RequestPointerLock();
1069 } 1069 }
1070 1070
(...skipping 174 matching lines...) Expand 10 before | Expand all | Expand 10 after
1245 if (RuntimeEnabledFeatures::presentationEnabled()) 1245 if (RuntimeEnabledFeatures::presentationEnabled())
1246 PresentationController::ProvideTo(frame, client->PresentationClient()); 1246 PresentationController::ProvideTo(frame, client->PresentationClient());
1247 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) { 1247 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) {
1248 ProvideAudioOutputDeviceClientTo(frame, 1248 ProvideAudioOutputDeviceClientTo(frame,
1249 new AudioOutputDeviceClientImpl(frame)); 1249 new AudioOutputDeviceClientImpl(frame));
1250 } 1250 }
1251 InstalledAppController::ProvideTo(frame, client->GetRelatedAppsFetcher()); 1251 InstalledAppController::ProvideTo(frame, client->GetRelatedAppsFetcher());
1252 } 1252 }
1253 1253
1254 } // namespace blink 1254 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/ChromeClientImpl.h ('k') | third_party/WebKit/Source/web/WebViewImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698