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

Side by Side Diff: third_party/WebKit/Source/core/page/ChromeClient.cpp

Issue 2601763002: WebFrame cleanup: Move addMessageToConsole to WebLocalFrame (Closed)
Patch Set: Created 3 years, 12 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) 2006, 2007, 2009, 2011 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2007, 2009, 2011 Apple Inc. All rights reserved.
3 * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies) 3 * Copyright (C) 2008, 2010 Nokia Corporation and/or its subsidiary(-ies)
4 * Copyright (C) 2012, Samsung Electronics. All rights reserved. 4 * Copyright (C) 2012, Samsung Electronics. All rights reserved.
5 * 5 *
6 * This library is free software; you can redistribute it and/or 6 * This library is free software; you can redistribute it and/or
7 * modify it under the terms of the GNU Library General Public 7 * modify it under the terms of the GNU Library General Public
8 * License as published by the Free Software Foundation; either 8 * License as published by the Free Software Foundation; either
9 * version 2 of the License, or (at your option) any later version. 9 * version 2 of the License, or (at your option) any later version.
10 * 10 *
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 setWindowRect(window, frame); 61 setWindowRect(window, frame);
62 } 62 }
63 63
64 bool ChromeClient::canOpenModalIfDuringPageDismissal( 64 bool ChromeClient::canOpenModalIfDuringPageDismissal(
65 Frame* mainFrame, 65 Frame* mainFrame,
66 ChromeClient::DialogType dialog, 66 ChromeClient::DialogType dialog,
67 const String& message) { 67 const String& message) {
68 for (Frame* frame = mainFrame; frame; frame = frame->tree().traverseNext()) { 68 for (Frame* frame = mainFrame; frame; frame = frame->tree().traverseNext()) {
69 if (!frame->isLocalFrame()) 69 if (!frame->isLocalFrame())
70 continue; 70 continue;
71 LocalFrame& localFrame = toLocalFrame(*frame);
71 Document::PageDismissalType dismissal = 72 Document::PageDismissalType dismissal =
72 toLocalFrame(frame)->document()->pageDismissalEventBeingDispatched(); 73 localFrame.document()->pageDismissalEventBeingDispatched();
73 if (dismissal != Document::NoDismissal) 74 if (dismissal != Document::NoDismissal) {
74 return shouldOpenModalDialogDuringPageDismissal(dialog, message, 75 return shouldOpenModalDialogDuringPageDismissal(localFrame, dialog,
75 dismissal); 76 message, dismissal);
77 }
76 } 78 }
77 return true; 79 return true;
78 } 80 }
79 81
80 void ChromeClient::setWindowFeatures(const WindowFeatures& features) { 82 void ChromeClient::setWindowFeatures(const WindowFeatures& features) {
81 setToolbarsVisible(features.toolBarVisible || features.locationBarVisible); 83 setToolbarsVisible(features.toolBarVisible || features.locationBarVisible);
82 setStatusbarVisible(features.statusBarVisible); 84 setStatusbarVisible(features.statusBarVisible);
83 setScrollbarsVisible(features.scrollbarsVisible); 85 setScrollbarsVisible(features.scrollbarsVisible);
84 setMenubarVisible(features.menuBarVisible); 86 setMenubarVisible(features.menuBarVisible);
85 setResizable(features.resizable); 87 setResizable(features.resizable);
(...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 // Suspend pages in case the client method runs a new event loop that would 214 // Suspend pages in case the client method runs a new event loop that would
213 // otherwise cause the load to continue while we're in the middle of 215 // otherwise cause the load to continue while we're in the middle of
214 // executing JavaScript. 216 // executing JavaScript.
215 ScopedPageSuspender suspender; 217 ScopedPageSuspender suspender;
216 218
217 printDelegate(frame); 219 printDelegate(frame);
218 return true; 220 return true;
219 } 221 }
220 222
221 } // namespace blink 223 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698