Commit d2a8ed84 authored by Kuo Jen Wei's avatar Kuo Jen Wei Committed by Commit Bot

[CCA] Rename PhotoResolPreferrer to PhotoConstraintsPreferrer.

Bug: b/117810572
Test: Pass presubmit check. Pass tast run <DUT> 'camera.CCAUI*'
Change-Id: I9d71ab1c68cb435759cb0416667aa3af78ec2121
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1915645
Auto-Submit: Kuo Jen Wei <inker@chromium.org>
Reviewed-by: default avatarShik Chen <shik@chromium.org>
Commit-Queue: Kuo Jen Wei <inker@chromium.org>
Cr-Commit-Position: refs/heads/master@{#715211}
parent 01753efe
...@@ -437,7 +437,8 @@ cca.device.VideoConstraintsPreferrer = ...@@ -437,7 +437,8 @@ cca.device.VideoConstraintsPreferrer =
/** /**
* Controller for handling photo resolution preference. * Controller for handling photo resolution preference.
*/ */
cca.device.PhotoResolPreferrer = class extends cca.device.ConstraintsPreferrer { cca.device.PhotoConstraintsPreferrer =
class extends cca.device.ConstraintsPreferrer {
/** /**
* @param {!function()} doReconfigureStream * @param {!function()} doReconfigureStream
* @public * @public
......
...@@ -20,13 +20,13 @@ cca.device = cca.device || {}; ...@@ -20,13 +20,13 @@ cca.device = cca.device || {};
*/ */
cca.device.DeviceInfoUpdater = class { cca.device.DeviceInfoUpdater = class {
/** /**
* @param {!cca.device.PhotoResolPreferrer} photoPreferrer * @param {!cca.device.PhotoConstraintsPreferrer} photoPreferrer
* @param {!cca.device.VideoConstraintsPreferrer} videoPreferrer * @param {!cca.device.VideoConstraintsPreferrer} videoPreferrer
* @public * @public
* */ * */
constructor(photoPreferrer, videoPreferrer) { constructor(photoPreferrer, videoPreferrer) {
/** /**
* @type {!cca.device.PhotoResolPreferrer} * @type {!cca.device.PhotoConstraintsPreferrer}
* @private * @private
*/ */
this.photoPreferrer_ = photoPreferrer; this.photoPreferrer_ = photoPreferrer;
......
...@@ -25,11 +25,11 @@ cca.App = function() { ...@@ -25,11 +25,11 @@ cca.App = function() {
this.gallery_ = new cca.models.Gallery(); this.gallery_ = new cca.models.Gallery();
/** /**
* @type {cca.device.PhotoResolPreferrer} * @type {cca.device.PhotoConstraintsPreferrer}
* @private * @private
*/ */
this.photoPreferrer_ = this.photoPreferrer_ = new cca.device.PhotoConstraintsPreferrer(
new cca.device.PhotoResolPreferrer(() => this.cameraView_.restart()); () => this.cameraView_.restart());
/** /**
* @type {cca.device.VideoConstraintsPreferrer} * @type {cca.device.VideoConstraintsPreferrer}
......
...@@ -31,7 +31,7 @@ cca.views.CameraSuspendedError = class extends Error { ...@@ -31,7 +31,7 @@ cca.views.CameraSuspendedError = class extends Error {
* Creates the camera-view controller. * Creates the camera-view controller.
* @param {!cca.models.ResultSaver} resultSaver * @param {!cca.models.ResultSaver} resultSaver
* @param {!cca.device.DeviceInfoUpdater} infoUpdater * @param {!cca.device.DeviceInfoUpdater} infoUpdater
* @param {!cca.device.PhotoResolPreferrer} photoPreferrer * @param {!cca.device.PhotoConstraintsPreferrer} photoPreferrer
* @param {!cca.device.VideoConstraintsPreferrer} videoPreferrer * @param {!cca.device.VideoConstraintsPreferrer} videoPreferrer
* @constructor * @constructor
*/ */
......
...@@ -84,7 +84,7 @@ cca.views.camera.Mode = { ...@@ -84,7 +84,7 @@ cca.views.camera.Mode = {
/** /**
* Mode controller managing capture sequence of different camera mode. * Mode controller managing capture sequence of different camera mode.
* @param {!cca.views.camera.Mode} defaultMode Default mode to be switched to. * @param {!cca.views.camera.Mode} defaultMode Default mode to be switched to.
* @param {cca.device.PhotoResolPreferrer} photoResolPreferrer * @param {cca.device.PhotoConstraintsPreferrer} photoPreferrer
* @param {cca.device.VideoConstraintsPreferrer} videoPreferrer * @param {cca.device.VideoConstraintsPreferrer} videoPreferrer
* @param {!DoSwitchMode} doSwitchMode * @param {!DoSwitchMode} doSwitchMode
* @param {!DoSavePhoto} doSavePhoto * @param {!DoSavePhoto} doSavePhoto
...@@ -93,7 +93,7 @@ cca.views.camera.Mode = { ...@@ -93,7 +93,7 @@ cca.views.camera.Mode = {
* @constructor * @constructor
*/ */
cca.views.camera.Modes = function( cca.views.camera.Modes = function(
defaultMode, photoResolPreferrer, videoPreferrer, doSwitchMode, doSavePhoto, defaultMode, photoPreferrer, videoPreferrer, doSwitchMode, doSavePhoto,
createVideoSaver, doSaveVideo) { createVideoSaver, doSaveVideo) {
/** /**
* @type {!DoSwitchMode} * @type {!DoSwitchMode}
...@@ -145,7 +145,7 @@ cca.views.camera.Modes = function( ...@@ -145,7 +145,7 @@ cca.views.camera.Modes = function(
captureFactory: () => new cca.views.camera.Photo( captureFactory: () => new cca.views.camera.Photo(
this.stream_, doSavePhoto, this.captureResolution_), this.stream_, doSavePhoto, this.captureResolution_),
isSupported: async () => true, isSupported: async () => true,
resolutionConfig: photoResolPreferrer, resolutionConfig: photoPreferrer,
v1Config: cca.views.camera.Modes.getV1Constraints.bind(this, false), v1Config: cca.views.camera.Modes.getV1Constraints.bind(this, false),
nextMode: 'square-mode', nextMode: 'square-mode',
captureIntent: cros.mojom.CaptureIntent.STILL_CAPTURE, captureIntent: cros.mojom.CaptureIntent.STILL_CAPTURE,
...@@ -154,7 +154,7 @@ cca.views.camera.Modes = function( ...@@ -154,7 +154,7 @@ cca.views.camera.Modes = function(
captureFactory: () => new cca.views.camera.Square( captureFactory: () => new cca.views.camera.Square(
this.stream_, doSavePhoto, this.captureResolution_), this.stream_, doSavePhoto, this.captureResolution_),
isSupported: async () => true, isSupported: async () => true,
resolutionConfig: photoResolPreferrer, resolutionConfig: photoPreferrer,
v1Config: cca.views.camera.Modes.getV1Constraints.bind(this, false), v1Config: cca.views.camera.Modes.getV1Constraints.bind(this, false),
nextMode: 'portrait-mode', nextMode: 'portrait-mode',
captureIntent: cros.mojom.CaptureIntent.STILL_CAPTURE, captureIntent: cros.mojom.CaptureIntent.STILL_CAPTURE,
...@@ -172,7 +172,7 @@ cca.views.camera.Modes = function( ...@@ -172,7 +172,7 @@ cca.views.camera.Modes = function(
} }
return await deviceOperator.isPortraitModeSupported(deviceId); return await deviceOperator.isPortraitModeSupported(deviceId);
}, },
resolutionConfig: photoResolPreferrer, resolutionConfig: photoPreferrer,
v1Config: cca.views.camera.Modes.getV1Constraints.bind(this, false), v1Config: cca.views.camera.Modes.getV1Constraints.bind(this, false),
nextMode: 'photo-mode', nextMode: 'photo-mode',
captureIntent: cros.mojom.CaptureIntent.STILL_CAPTURE, captureIntent: cros.mojom.CaptureIntent.STILL_CAPTURE,
......
...@@ -29,7 +29,7 @@ cca.views.CameraIntent = class extends cca.views.Camera { ...@@ -29,7 +29,7 @@ cca.views.CameraIntent = class extends cca.views.Camera {
/** /**
* @param {!cca.intent.Intent} intent * @param {!cca.intent.Intent} intent
* @param {!cca.device.DeviceInfoUpdater} infoUpdater * @param {!cca.device.DeviceInfoUpdater} infoUpdater
* @param {!cca.device.PhotoResolPreferrer} photoPreferrer * @param {!cca.device.PhotoConstraintsPreferrer} photoPreferrer
* @param {!cca.device.VideoConstraintsPreferrer} videoPreferrer * @param {!cca.device.VideoConstraintsPreferrer} videoPreferrer
*/ */
constructor(intent, infoUpdater, photoPreferrer, videoPreferrer) { constructor(intent, infoUpdater, photoPreferrer, videoPreferrer) {
......
...@@ -132,7 +132,7 @@ cca.views.MasterSettings.prototype.openFeedback = function() { ...@@ -132,7 +132,7 @@ cca.views.MasterSettings.prototype.openFeedback = function() {
/** /**
* Creates the controller of resolution settings view. * Creates the controller of resolution settings view.
* @param {!cca.device.DeviceInfoUpdater} infoUpdater * @param {!cca.device.DeviceInfoUpdater} infoUpdater
* @param {!cca.device.PhotoResolPreferrer} photoPreferrer * @param {!cca.device.PhotoConstraintsPreferrer} photoPreferrer
* @param {!cca.device.VideoConstraintsPreferrer} videoPreferrer * @param {!cca.device.VideoConstraintsPreferrer} videoPreferrer
* @extends {cca.views.BaseSettings} * @extends {cca.views.BaseSettings}
* @constructor * @constructor
...@@ -172,7 +172,7 @@ cca.views.ResolutionSettings = function( ...@@ -172,7 +172,7 @@ cca.views.ResolutionSettings = function(
}); });
/** /**
* @type {!cca.device.PhotoResolPreferrer} * @type {!cca.device.PhotoConstraintsPreferrer}
* @private * @private
*/ */
this.photoPreferrer_ = photoPreferrer; this.photoPreferrer_ = photoPreferrer;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment