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

Unified Diff: third_party/WebKit/Source/web/WebViewImpl.cpp

Issue 2826833002: Revert of [DevTools] Consolidate overlay-related functionality in Overlay domain (Closed)
Patch Set: Created 3 years, 8 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/web/WebViewImpl.cpp
diff --git a/third_party/WebKit/Source/web/WebViewImpl.cpp b/third_party/WebKit/Source/web/WebViewImpl.cpp
index fc7f6e20ebd6a2c281605f9595ef0c2b8e03319f..af54f9e9ec198925a30206291bdbc2d6b855caeb 100644
--- a/third_party/WebKit/Source/web/WebViewImpl.cpp
+++ b/third_party/WebKit/Source/web/WebViewImpl.cpp
@@ -160,7 +160,7 @@
#include "web/DedicatedWorkerMessagingProxyProviderImpl.h"
#include "web/DevToolsEmulator.h"
#include "web/FullscreenController.h"
-#include "web/InspectorOverlayAgent.h"
+#include "web/InspectorOverlay.h"
#include "web/LinkHighlightImpl.h"
#include "web/PageOverlay.h"
#include "web/PrerendererClientImpl.h"
@@ -433,9 +433,9 @@
return main_frame ? main_frame->DevToolsAgentImpl() : nullptr;
}
-InspectorOverlayAgent* WebViewImpl::GetInspectorOverlay() {
+InspectorOverlay* WebViewImpl::GetInspectorOverlay() {
if (WebDevToolsAgentImpl* devtools = MainFrameDevToolsAgentImpl())
- return devtools->OverlayAgent();
+ return devtools->Overlay();
return nullptr;
}
@@ -2032,7 +2032,7 @@
PageWidgetDelegate::UpdateAllLifecyclePhases(*page_,
*MainFrameImpl()->GetFrame());
- if (InspectorOverlayAgent* overlay = GetInspectorOverlay()) {
+ if (InspectorOverlay* overlay = GetInspectorOverlay()) {
overlay->UpdateAllLifecyclePhases();
// TODO(chrishtr): integrate paint into the overlay's lifecycle.
if (overlay->GetPageOverlay() &&
@@ -2175,7 +2175,7 @@
if (dev_tools_emulator_->HandleInputEvent(input_event))
return WebInputEventResult::kHandledSuppressed;
- if (InspectorOverlayAgent* overlay = GetInspectorOverlay()) {
+ if (InspectorOverlay* overlay = GetInspectorOverlay()) {
if (overlay->HandleInputEvent(input_event))
return WebInputEventResult::kHandledSuppressed;
}
@@ -4138,7 +4138,7 @@
void WebViewImpl::UpdatePageOverlays() {
if (page_color_overlay_)
page_color_overlay_->Update();
- if (InspectorOverlayAgent* overlay = GetInspectorOverlay()) {
+ if (InspectorOverlay* overlay = GetInspectorOverlay()) {
PageOverlay* inspector_page_overlay = overlay->GetPageOverlay();
if (inspector_page_overlay)
inspector_page_overlay->Update();
« no previous file with comments | « third_party/WebKit/Source/web/WebViewImpl.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698