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

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

Issue 2258353002: Reland of Remove content::NotificationPermissionDispatcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@permissions_typemaps
Patch Set: Remove NotificationPermissionClient initialization from ChromeClientImpl. Created 4 years, 3 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 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 #include "core/layout/compositing/CompositedSelection.h" 51 #include "core/layout/compositing/CompositedSelection.h"
52 #include "core/loader/DocumentLoader.h" 52 #include "core/loader/DocumentLoader.h"
53 #include "core/loader/FrameLoadRequest.h" 53 #include "core/loader/FrameLoadRequest.h"
54 #include "core/page/Page.h" 54 #include "core/page/Page.h"
55 #include "core/page/PopupOpeningObserver.h" 55 #include "core/page/PopupOpeningObserver.h"
56 #include "modules/accessibility/AXObject.h" 56 #include "modules/accessibility/AXObject.h"
57 #include "modules/audio_output_devices/AudioOutputDeviceClient.h" 57 #include "modules/audio_output_devices/AudioOutputDeviceClient.h"
58 #include "modules/bluetooth/BluetoothSupplement.h" 58 #include "modules/bluetooth/BluetoothSupplement.h"
59 #include "modules/installedapp/InstalledAppController.h" 59 #include "modules/installedapp/InstalledAppController.h"
60 #include "modules/mediastream/UserMediaController.h" 60 #include "modules/mediastream/UserMediaController.h"
61 #include "modules/notifications/NotificationPermissionClient.h"
62 #include "modules/permissions/PermissionController.h" 61 #include "modules/permissions/PermissionController.h"
63 #include "modules/presentation/PresentationController.h" 62 #include "modules/presentation/PresentationController.h"
64 #include "modules/push_messaging/PushController.h" 63 #include "modules/push_messaging/PushController.h"
65 #include "modules/screen_orientation/ScreenOrientationController.h" 64 #include "modules/screen_orientation/ScreenOrientationController.h"
66 #include "modules/vr/VRController.h" 65 #include "modules/vr/VRController.h"
67 #include "platform/Cursor.h" 66 #include "platform/Cursor.h"
68 #include "platform/FileChooser.h" 67 #include "platform/FileChooser.h"
69 #include "platform/Histogram.h" 68 #include "platform/Histogram.h"
70 #include "platform/KeyboardCodes.h" 69 #include "platform/KeyboardCodes.h"
71 #include "platform/RuntimeEnabledFeatures.h" 70 #include "platform/RuntimeEnabledFeatures.h"
(...skipping 30 matching lines...) Expand all
102 #include "public/web/WebWindowFeatures.h" 101 #include "public/web/WebWindowFeatures.h"
103 #include "web/AudioOutputDeviceClientImpl.h" 102 #include "web/AudioOutputDeviceClientImpl.h"
104 #include "web/ColorChooserPopupUIController.h" 103 #include "web/ColorChooserPopupUIController.h"
105 #include "web/ColorChooserUIController.h" 104 #include "web/ColorChooserUIController.h"
106 #include "web/DateTimeChooserImpl.h" 105 #include "web/DateTimeChooserImpl.h"
107 #include "web/ExternalDateTimeChooser.h" 106 #include "web/ExternalDateTimeChooser.h"
108 #include "web/ExternalPopupMenu.h" 107 #include "web/ExternalPopupMenu.h"
109 #include "web/IndexedDBClientImpl.h" 108 #include "web/IndexedDBClientImpl.h"
110 #include "web/LocalFileSystemClient.h" 109 #include "web/LocalFileSystemClient.h"
111 #include "web/NavigatorContentUtilsClientImpl.h" 110 #include "web/NavigatorContentUtilsClientImpl.h"
112 #include "web/NotificationPermissionClientImpl.h"
113 #include "web/PopupMenuImpl.h" 111 #include "web/PopupMenuImpl.h"
114 #include "web/WebFileChooserCompletionImpl.h" 112 #include "web/WebFileChooserCompletionImpl.h"
115 #include "web/WebFrameWidgetImpl.h" 113 #include "web/WebFrameWidgetImpl.h"
116 #include "web/WebInputEventConversion.h" 114 #include "web/WebInputEventConversion.h"
117 #include "web/WebLocalFrameImpl.h" 115 #include "web/WebLocalFrameImpl.h"
118 #include "web/WebPluginContainerImpl.h" 116 #include "web/WebPluginContainerImpl.h"
119 #include "web/WebSettingsImpl.h" 117 #include "web/WebSettingsImpl.h"
120 #include "web/WebViewImpl.h" 118 #include "web/WebViewImpl.h"
121 #include "wtf/PtrUtil.h" 119 #include "wtf/PtrUtil.h"
122 #include "wtf/text/CString.h" 120 #include "wtf/text/CString.h"
(...skipping 994 matching lines...) Expand 10 before | Expand all | Expand 10 after
1117 1115
1118 void ChromeClientImpl::installSupplements(LocalFrame& frame) 1116 void ChromeClientImpl::installSupplements(LocalFrame& frame)
1119 { 1117 {
1120 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(&frame); 1118 WebLocalFrameImpl* webFrame = WebLocalFrameImpl::fromFrame(&frame);
1121 WebFrameClient* client = webFrame->client(); 1119 WebFrameClient* client = webFrame->client();
1122 if (client) { 1120 if (client) {
1123 providePushControllerTo(frame, client->pushClient()); 1121 providePushControllerTo(frame, client->pushClient());
1124 provideUserMediaTo(frame, UserMediaClientImpl::create(client->userMediaC lient())); 1122 provideUserMediaTo(frame, UserMediaClientImpl::create(client->userMediaC lient()));
1125 } 1123 }
1126 1124
1127 provideNotificationPermissionClientTo(frame, NotificationPermissionClientImp l::create());
1128 provideIndexedDBClientTo(frame, IndexedDBClientImpl::create()); 1125 provideIndexedDBClientTo(frame, IndexedDBClientImpl::create());
1129 provideLocalFileSystemTo(frame, LocalFileSystemClient::create()); 1126 provideLocalFileSystemTo(frame, LocalFileSystemClient::create());
1130 provideNavigatorContentUtilsTo(frame, NavigatorContentUtilsClientImpl::creat e(webFrame)); 1127 provideNavigatorContentUtilsTo(frame, NavigatorContentUtilsClientImpl::creat e(webFrame));
1131 1128
1132 bool enableWebBluetooth = RuntimeEnabledFeatures::webBluetoothEnabled(); 1129 bool enableWebBluetooth = RuntimeEnabledFeatures::webBluetoothEnabled();
1133 #if OS(CHROMEOS) || OS(ANDROID) || OS(MACOSX) 1130 #if OS(CHROMEOS) || OS(ANDROID) || OS(MACOSX)
1134 enableWebBluetooth = true; 1131 enableWebBluetooth = true;
1135 #endif 1132 #endif
1136 if (enableWebBluetooth) 1133 if (enableWebBluetooth)
1137 BluetoothSupplement::provideTo(frame, client ? client->bluetooth() : nul lptr); 1134 BluetoothSupplement::provideTo(frame, client ? client->bluetooth() : nul lptr);
1138 1135
1139 ScreenOrientationController::provideTo(frame, client ? client->webScreenOrie ntationClient() : nullptr); 1136 ScreenOrientationController::provideTo(frame, client ? client->webScreenOrie ntationClient() : nullptr);
1140 if (RuntimeEnabledFeatures::presentationEnabled()) 1137 if (RuntimeEnabledFeatures::presentationEnabled())
1141 PresentationController::provideTo(frame, client ? client->presentationCl ient() : nullptr); 1138 PresentationController::provideTo(frame, client ? client->presentationCl ient() : nullptr);
1142 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) 1139 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled())
1143 provideAudioOutputDeviceClientTo(frame, AudioOutputDeviceClientImpl::cre ate()); 1140 provideAudioOutputDeviceClientTo(frame, AudioOutputDeviceClientImpl::cre ate());
1144 if (RuntimeEnabledFeatures::installedAppEnabled()) 1141 if (RuntimeEnabledFeatures::installedAppEnabled())
1145 InstalledAppController::provideTo(frame, client ? client->installedAppCl ient() : nullptr); 1142 InstalledAppController::provideTo(frame, client ? client->installedAppCl ient() : nullptr);
1146 } 1143 }
1147 1144
1148 } // namespace blink 1145 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698