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

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

Issue 2601763002: WebFrame cleanup: Move addMessageToConsole to WebLocalFrame (Closed)
Patch Set: Created 3 years, 11 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 893 matching lines...) Expand 10 before | Expand all | Expand 10 after
904 904
905 void ChromeClientImpl::closePagePopup(PagePopup* popup) { 905 void ChromeClientImpl::closePagePopup(PagePopup* popup) {
906 m_webView->closePagePopup(popup); 906 m_webView->closePagePopup(popup);
907 } 907 }
908 908
909 DOMWindow* ChromeClientImpl::pagePopupWindowForTesting() const { 909 DOMWindow* ChromeClientImpl::pagePopupWindowForTesting() const {
910 return m_webView->pagePopupWindow(); 910 return m_webView->pagePopupWindow();
911 } 911 }
912 912
913 bool ChromeClientImpl::shouldOpenModalDialogDuringPageDismissal( 913 bool ChromeClientImpl::shouldOpenModalDialogDuringPageDismissal(
914 const DialogType& dialogType, 914 LocalFrame& frame,
915 DialogType dialogType,
915 const String& dialogMessage, 916 const String& dialogMessage,
916 Document::PageDismissalType dismissalType) const { 917 Document::PageDismissalType dismissalType) const {
917 String message = String("Blocked ") + dialogTypeToString(dialogType) + "('" + 918 String message = String("Blocked ") + dialogTypeToString(dialogType) + "('" +
918 dialogMessage + "') during " + 919 dialogMessage + "') during " +
919 dismissalTypeToString(dismissalType) + "."; 920 dismissalTypeToString(dismissalType) + ".";
920 m_webView->mainFrame()->addMessageToConsole( 921 WebLocalFrameImpl::fromFrame(frame)->addMessageToConsole(
921 WebConsoleMessage(WebConsoleMessage::LevelError, message)); 922 WebConsoleMessage(WebConsoleMessage::LevelError, message));
922 923
923 return false; 924 return false;
924 } 925 }
925 926
926 void ChromeClientImpl::setEventListenerProperties( 927 void ChromeClientImpl::setEventListenerProperties(
927 WebEventListenerClass eventClass, 928 WebEventListenerClass eventClass,
928 WebEventListenerProperties properties) { 929 WebEventListenerProperties properties) {
929 if (WebLayerTreeView* treeView = m_webView->layerTreeView()) { 930 if (WebLayerTreeView* treeView = m_webView->layerTreeView()) {
930 treeView->setEventListenerProperties(eventClass, properties); 931 treeView->setEventListenerProperties(eventClass, properties);
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
1155 if (RuntimeEnabledFeatures::presentationEnabled()) 1156 if (RuntimeEnabledFeatures::presentationEnabled())
1156 PresentationController::provideTo(frame, client->presentationClient()); 1157 PresentationController::provideTo(frame, client->presentationClient());
1157 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled()) 1158 if (RuntimeEnabledFeatures::audioOutputDevicesEnabled())
1158 provideAudioOutputDeviceClientTo(frame, 1159 provideAudioOutputDeviceClientTo(frame,
1159 AudioOutputDeviceClientImpl::create()); 1160 AudioOutputDeviceClientImpl::create());
1160 if (RuntimeEnabledFeatures::installedAppEnabled()) 1161 if (RuntimeEnabledFeatures::installedAppEnabled())
1161 InstalledAppController::provideTo(frame, client->installedAppClient()); 1162 InstalledAppController::provideTo(frame, client->installedAppClient());
1162 } 1163 }
1163 1164
1164 } // namespace blink 1165 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698