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

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

Issue 1311673004: Make CanOpenBeforeUnloadConfirmPanel a RuntimeEnabledFeature Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 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
« no previous file with comments | « Source/platform/RuntimeEnabledFeatures.in ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 367 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 frame->client()->didAddMessageToConsole( 378 frame->client()->didAddMessageToConsole(
379 WebConsoleMessage(static_cast<WebConsoleMessage::Level>(level), mess age), 379 WebConsoleMessage(static_cast<WebConsoleMessage::Level>(level), mess age),
380 sourceID, 380 sourceID,
381 lineNumber, 381 lineNumber,
382 stackTrace); 382 stackTrace);
383 } 383 }
384 } 384 }
385 385
386 bool ChromeClientImpl::canOpenBeforeUnloadConfirmPanel() 386 bool ChromeClientImpl::canOpenBeforeUnloadConfirmPanel()
387 { 387 {
388 return !!m_webView->client(); 388 return RuntimeEnabledFeatures::canOpenBeforeUnloadConfirmPanelEnabled() && ! !m_webView->client();
389 } 389 }
390 390
391 bool ChromeClientImpl::openBeforeUnloadConfirmPanelDelegate(LocalFrame* frame, c onst String& message) 391 bool ChromeClientImpl::openBeforeUnloadConfirmPanelDelegate(LocalFrame* frame, c onst String& message)
392 { 392 {
393 notifyPopupOpeningObservers(); 393 notifyPopupOpeningObservers();
394 WebLocalFrameImpl* webframe = WebLocalFrameImpl::fromFrame(frame); 394 WebLocalFrameImpl* webframe = WebLocalFrameImpl::fromFrame(frame);
395 395
396 WebDataSource* ds = webframe->provisionalDataSource(); 396 WebDataSource* ds = webframe->provisionalDataSource();
397 bool isReload = ds && (ds->navigationType() == WebNavigationTypeReload); 397 bool isReload = ds && (ds->navigationType() == WebNavigationTypeReload);
398 398
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
966 for (const auto& observer : observers) 966 for (const auto& observer : observers)
967 observer->willOpenPopup(); 967 observer->willOpenPopup();
968 } 968 }
969 969
970 FloatSize ChromeClientImpl::elasticOverscroll() const 970 FloatSize ChromeClientImpl::elasticOverscroll() const
971 { 971 {
972 return m_webView->elasticOverscroll(); 972 return m_webView->elasticOverscroll();
973 } 973 }
974 974
975 } // namespace blink 975 } // namespace blink
OLDNEW
« no previous file with comments | « Source/platform/RuntimeEnabledFeatures.in ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698