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

Unified Diff: third_party/WebKit/Source/devtools/front_end/emulation/TouchModel.js

Issue 2819183002: [DevTools] Consolidate overlay-related functionality in Overlay domain (Closed)
Patch Set: rebased bad merge 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
Index: third_party/WebKit/Source/devtools/front_end/emulation/TouchModel.js
diff --git a/third_party/WebKit/Source/devtools/front_end/emulation/TouchModel.js b/third_party/WebKit/Source/devtools/front_end/emulation/TouchModel.js
index ce997a42407ba30237609e4f194318403d9d441e..883ccf642fe3f473091f55078165b7925ed87486 100644
--- a/third_party/WebKit/Source/devtools/front_end/emulation/TouchModel.js
+++ b/third_party/WebKit/Source/devtools/front_end/emulation/TouchModel.js
@@ -54,8 +54,8 @@ Emulation.MultitargetTouchModel = class {
if (this._customTouchEnabled)
current = {enabled: true, configuration: 'mobile'};
- var domModel = target.model(SDK.DOMModel);
- var inspectModeEnabled = domModel ? domModel.inspectModeEnabled() : false;
+ var overlayModel = target.model(SDK.OverlayModel);
+ var inspectModeEnabled = overlayModel ? overlayModel.inspectModeEnabled() : false;
if (inspectModeEnabled)
current = {enabled: false, configuration: 'mobile'};
@@ -107,8 +107,8 @@ Emulation.MultitargetTouchModel = class {
* @param {!Common.Event} event
*/
_inspectModeToggled(event) {
- var domModel = /** @type {!SDK.DOMModel} */ (event.data);
- this._applyToTarget(domModel.target());
+ var overlayModel = /** @type {!SDK.OverlayModel} */ (event.data);
+ this._applyToTarget(overlayModel.target());
}
/**
@@ -116,9 +116,9 @@ Emulation.MultitargetTouchModel = class {
* @param {!SDK.Target} target
*/
targetAdded(target) {
- var domModel = target.model(SDK.DOMModel);
- if (domModel)
- domModel.addEventListener(SDK.DOMModel.Events.InspectModeWillBeToggled, this._inspectModeToggled, this);
+ var overlayModel = target.model(SDK.OverlayModel);
+ if (overlayModel)
+ overlayModel.addEventListener(SDK.OverlayModel.Events.InspectModeWillBeToggled, this._inspectModeToggled, this);
this._applyToTarget(target);
}
@@ -127,9 +127,11 @@ Emulation.MultitargetTouchModel = class {
* @param {!SDK.Target} target
*/
targetRemoved(target) {
- var domModel = target.model(SDK.DOMModel);
- if (domModel)
- domModel.removeEventListener(SDK.DOMModel.Events.InspectModeWillBeToggled, this._inspectModeToggled, this);
+ var overlayModel = target.model(SDK.OverlayModel);
+ if (overlayModel) {
+ overlayModel.removeEventListener(
+ SDK.OverlayModel.Events.InspectModeWillBeToggled, this._inspectModeToggled, this);
+ }
}
};

Powered by Google App Engine
This is Rietveld 408576698