Commit 2ef60a72 authored by Kuo Jen Wei's avatar Kuo Jen Wei Committed by Commit Bot

CCA: Rename MasterSettings to PrimarySettings

Bug: 1123783, b:162281119
Test: Manually
Change-Id: Ie79e847b761a429c94b19898b1dbb78d2f308dba
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2389290Reviewed-by: default avatarShik Chen <shik@chromium.org>
Commit-Queue: Inker Kuo <inker@chromium.org>
Auto-Submit: Inker Kuo <inker@chromium.org>
Cr-Commit-Position: refs/heads/master@{#803804}
parent 085125a6
...@@ -29,7 +29,7 @@ import {CameraIntent} from './views/camera_intent.js'; ...@@ -29,7 +29,7 @@ import {CameraIntent} from './views/camera_intent.js';
import {Dialog} from './views/dialog.js'; import {Dialog} from './views/dialog.js';
import { import {
BaseSettings, BaseSettings,
MasterSettings, PrimarySettings,
ResolutionSettings, ResolutionSettings,
} from './views/settings.js'; } from './views/settings.js';
import {View} from './views/view.js'; import {View} from './views/view.js';
...@@ -109,7 +109,7 @@ export class App { ...@@ -109,7 +109,7 @@ export class App {
// Set up views navigation by their DOM z-order. // Set up views navigation by their DOM z-order.
nav.setup([ nav.setup([
this.cameraView_, this.cameraView_,
new MasterSettings(), new PrimarySettings(),
new BaseSettings(ViewName.GRID_SETTINGS), new BaseSettings(ViewName.GRID_SETTINGS),
new BaseSettings(ViewName.TIMER_SETTINGS), new BaseSettings(ViewName.TIMER_SETTINGS),
resolutionSettings, resolutionSettings,
......
...@@ -82,16 +82,16 @@ export class BaseSettings extends View { ...@@ -82,16 +82,16 @@ export class BaseSettings extends View {
* @private * @private
*/ */
openSubSettings(name) { openSubSettings(name) {
// Dismiss master-settings if sub-settings was dismissed by background // Dismiss primary-settings if sub-settings was dismissed by background
// click. // click.
nav.open(name).then((cond) => cond && cond['bkgnd'] && this.leave(cond)); nav.open(name).then((cond) => cond && cond['bkgnd'] && this.leave(cond));
} }
} }
/** /**
* Controller of master settings view. * Controller of primary settings view.
*/ */
export class MasterSettings extends BaseSettings { export class PrimarySettings extends BaseSettings {
/** /**
* @public * @public
*/ */
......
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