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

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

Issue 2258673002: Revert of Remove content::NotificationPermissionDispatcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permissions_typemaps
Patch Set: Created 4 years, 4 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 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 138 matching lines...) Expand 10 before | Expand all | Expand 10 after
149 #include "core/page/PrintContext.h" 149 #include "core/page/PrintContext.h"
150 #include "core/paint/PaintLayer.h" 150 #include "core/paint/PaintLayer.h"
151 #include "core/paint/TransformRecorder.h" 151 #include "core/paint/TransformRecorder.h"
152 #include "core/style/StyleInheritedData.h" 152 #include "core/style/StyleInheritedData.h"
153 #include "core/timing/DOMWindowPerformance.h" 153 #include "core/timing/DOMWindowPerformance.h"
154 #include "core/timing/Performance.h" 154 #include "core/timing/Performance.h"
155 #include "modules/app_banner/AppBannerController.h" 155 #include "modules/app_banner/AppBannerController.h"
156 #include "modules/audio_output_devices/AudioOutputDeviceClient.h" 156 #include "modules/audio_output_devices/AudioOutputDeviceClient.h"
157 #include "modules/bluetooth/BluetoothSupplement.h" 157 #include "modules/bluetooth/BluetoothSupplement.h"
158 #include "modules/installedapp/InstalledAppController.h" 158 #include "modules/installedapp/InstalledAppController.h"
159 #include "modules/notifications/NotificationPermissionClient.h"
159 #include "modules/presentation/PresentationController.h" 160 #include "modules/presentation/PresentationController.h"
160 #include "modules/push_messaging/PushController.h" 161 #include "modules/push_messaging/PushController.h"
161 #include "modules/screen_orientation/ScreenOrientationController.h" 162 #include "modules/screen_orientation/ScreenOrientationController.h"
162 #include "modules/wake_lock/ScreenWakeLock.h" 163 #include "modules/wake_lock/ScreenWakeLock.h"
163 #include "platform/ScriptForbiddenScope.h" 164 #include "platform/ScriptForbiddenScope.h"
164 #include "platform/TraceEvent.h" 165 #include "platform/TraceEvent.h"
165 #include "platform/UserGestureIndicator.h" 166 #include "platform/UserGestureIndicator.h"
166 #include "platform/clipboard/ClipboardUtilities.h" 167 #include "platform/clipboard/ClipboardUtilities.h"
167 #include "platform/fonts/FontCache.h" 168 #include "platform/fonts/FontCache.h"
168 #include "platform/graphics/GraphicsContext.h" 169 #include "platform/graphics/GraphicsContext.h"
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
213 #include "public/web/WebSerializedScriptValue.h" 214 #include "public/web/WebSerializedScriptValue.h"
214 #include "public/web/WebTreeScopeType.h" 215 #include "public/web/WebTreeScopeType.h"
215 #include "skia/ext/platform_canvas.h" 216 #include "skia/ext/platform_canvas.h"
216 #include "web/AssociatedURLLoader.h" 217 #include "web/AssociatedURLLoader.h"
217 #include "web/AudioOutputDeviceClientImpl.h" 218 #include "web/AudioOutputDeviceClientImpl.h"
218 #include "web/CompositionUnderlineVectorBuilder.h" 219 #include "web/CompositionUnderlineVectorBuilder.h"
219 #include "web/FindInPageCoordinates.h" 220 #include "web/FindInPageCoordinates.h"
220 #include "web/IndexedDBClientImpl.h" 221 #include "web/IndexedDBClientImpl.h"
221 #include "web/LocalFileSystemClient.h" 222 #include "web/LocalFileSystemClient.h"
222 #include "web/NavigatorContentUtilsClientImpl.h" 223 #include "web/NavigatorContentUtilsClientImpl.h"
224 #include "web/NotificationPermissionClientImpl.h"
223 #include "web/RemoteFrameOwner.h" 225 #include "web/RemoteFrameOwner.h"
224 #include "web/SharedWorkerRepositoryClientImpl.h" 226 #include "web/SharedWorkerRepositoryClientImpl.h"
225 #include "web/SuspendableScriptExecutor.h" 227 #include "web/SuspendableScriptExecutor.h"
226 #include "web/TextFinder.h" 228 #include "web/TextFinder.h"
227 #include "web/WebDataSourceImpl.h" 229 #include "web/WebDataSourceImpl.h"
228 #include "web/WebDevToolsAgentImpl.h" 230 #include "web/WebDevToolsAgentImpl.h"
229 #include "web/WebFrameWidgetImpl.h" 231 #include "web/WebFrameWidgetImpl.h"
230 #include "web/WebPluginContainerImpl.h" 232 #include "web/WebPluginContainerImpl.h"
231 #include "web/WebRemoteFrameImpl.h" 233 #include "web/WebRemoteFrameImpl.h"
232 #include "web/WebViewImpl.h" 234 #include "web/WebViewImpl.h"
(...skipping 1252 matching lines...) Expand 10 before | Expand all | Expand 10 after
1485 1487
1486 // FIXME: we shouldn't add overhead to every frame by registering these obje cts when they're not used. 1488 // FIXME: we shouldn't add overhead to every frame by registering these obje cts when they're not used.
1487 if (!m_frame) 1489 if (!m_frame)
1488 return; 1490 return;
1489 1491
1490 if (m_client) { 1492 if (m_client) {
1491 providePushControllerTo(*m_frame, m_client->pushClient()); 1493 providePushControllerTo(*m_frame, m_client->pushClient());
1492 provideUserMediaTo(*m_frame, UserMediaClientImpl::create(m_client->userM ediaClient())); 1494 provideUserMediaTo(*m_frame, UserMediaClientImpl::create(m_client->userM ediaClient()));
1493 } 1495 }
1494 1496
1497 provideNotificationPermissionClientTo(*m_frame, NotificationPermissionClient Impl::create());
1495 provideIndexedDBClientTo(*m_frame, IndexedDBClientImpl::create()); 1498 provideIndexedDBClientTo(*m_frame, IndexedDBClientImpl::create());
1496 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create()); 1499 provideLocalFileSystemTo(*m_frame, LocalFileSystemClient::create());
1497 provideNavigatorContentUtilsTo(*m_frame, NavigatorContentUtilsClientImpl::cr eate(this)); 1500 provideNavigatorContentUtilsTo(*m_frame, NavigatorContentUtilsClientImpl::cr eate(this));
1498 1501
1499 bool enableWebBluetooth = RuntimeEnabledFeatures::webBluetoothEnabled(); 1502 bool enableWebBluetooth = RuntimeEnabledFeatures::webBluetoothEnabled();
1500 #if OS(CHROMEOS) || OS(ANDROID) || OS(MACOSX) 1503 #if OS(CHROMEOS) || OS(ANDROID) || OS(MACOSX)
1501 enableWebBluetooth = true; 1504 enableWebBluetooth = true;
1502 #endif 1505 #endif
1503 if (enableWebBluetooth) 1506 if (enableWebBluetooth)
1504 BluetoothSupplement::provideTo(*m_frame, m_client ? m_client->bluetooth( ) : nullptr); 1507 BluetoothSupplement::provideTo(*m_frame, m_client ? m_client->bluetooth( ) : nullptr);
(...skipping 732 matching lines...) Expand 10 before | Expand all | Expand 10 after
2237 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol; 2240 feature = UseCounter::ChromeLoadTimesNpnNegotiatedProtocol;
2238 } else if (metric == "wasAlternateProtocolAvailable") { 2241 } else if (metric == "wasAlternateProtocolAvailable") {
2239 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable; 2242 feature = UseCounter::ChromeLoadTimesWasAlternateProtocolAvailable;
2240 } else if (metric == "connectionInfo") { 2243 } else if (metric == "connectionInfo") {
2241 feature = UseCounter::ChromeLoadTimesConnectionInfo; 2244 feature = UseCounter::ChromeLoadTimesConnectionInfo;
2242 } 2245 }
2243 UseCounter::count(frame(), feature); 2246 UseCounter::count(frame(), feature);
2244 } 2247 }
2245 2248
2246 } // namespace blink 2249 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/web/NotificationPermissionClientImpl.cpp ('k') | third_party/WebKit/Source/web/web.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698