Commit 85b8eaae authored by Jeevan Shikaram's avatar Jeevan Shikaram Committed by Commit Bot

[App Management] Rename permission-view to detail-view

Rename permission-view to detail-view for better clarity.

Bug: 999016
Change-Id: I365ea44f97cb3c7b261176310f5372acfb28154a
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1943072
Commit-Queue: Jeevan Shikaram <jshikaram@chromium.org>
Reviewed-by: default avatarMarc Treib <treib@chromium.org>
Reviewed-by: default avatarMaggie Cai <mxcai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#720373}
parent 4a610e9c
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="actions.html">
<link rel="import" href="arc_permission_view.html">
<link rel="import" href="arc_detail_view.html">
<link rel="import" href="browser_proxy.html">
<link rel="import" href="chrome_app_permission_view.html">
<link rel="import" href="chrome_app_detail_view.html">
<link rel="import" href="dom_switch.html">
<link rel="import" href="main_view.html">
<link rel="import" href="notifications_view.html">
<link rel="import" href="pwa_permission_view.html">
<link rel="import" href="pwa_detail_view.html">
<link rel="import" href="router.html">
<link rel="import" href="search_view.html">
<link rel="import" href="store.html">
......@@ -47,13 +47,13 @@
</app-management-main-view>
<app-management-notifications-view route-id="notifications-view">
</app-management-notifications-view>
<app-management-pwa-permission-view route-id="pwa-permission-view">
</app-management-pwa-permission-view>
<app-management-chrome-app-permission-view
route-id="chrome-app-permission-view">
</app-management-chrome-app-permission-view>
<app-management-arc-permission-view route-id="arc-permission-view">
</app-management-arc-permission-view>
<app-management-pwa-detail-view route-id="pwa-detail-view">
</app-management-pwa-detail-view>
<app-management-chrome-app-detail-view
route-id="chrome-app-detail-view">
</app-management-chrome-app-detail-view>
<app-management-arc-detail-view route-id="arc-detail-view">
</app-management-arc-detail-view>
<app-management-search-view route-id="search-view">
</app-management-search-view>
</template>
......
......@@ -82,11 +82,11 @@ Polymer({
state.apps[assert(state.currentPage.selectedAppId)].type;
switch (selectedAppType) {
case (AppType.kWeb):
return 'pwa-permission-view';
return 'pwa-detail-view';
case (AppType.kExtension):
return 'chrome-app-permission-view';
return 'chrome-app-detail-view';
case (AppType.kArc):
return 'arc-permission-view';
return 'arc-detail-view';
default:
assertNotReached();
}
......
......@@ -8,19 +8,19 @@ js_type_check("closure_compile") {
deps = [
":actions",
":api_listener",
":app_detail_view",
":app_item",
":app_management_page",
":app_permission_view",
":arc_permission_view",
":arc_detail_view",
":browser_proxy",
":chrome_app_permission_view",
":chrome_app_detail_view",
":constants",
":dom_switch",
":fake_page_handler",
":main_view",
":permission_item",
":pin_to_shelf_item",
":pwa_permission_view",
":pwa_detail_view",
":reducers",
":store",
":store_client",
......@@ -65,18 +65,18 @@ js_library("app_management_page") {
]
}
js_library("app_permission_view") {
js_library("app_detail_view") {
deps = [
":arc_permission_view",
":chrome_app_permission_view",
":arc_detail_view",
":chrome_app_detail_view",
":dom_switch",
":pwa_permission_view",
":pwa_detail_view",
":store_client",
"../../..:route",
]
}
js_library("arc_permission_view") {
js_library("arc_detail_view") {
deps = [
":constants",
":fake_page_handler",
......@@ -94,7 +94,7 @@ js_library("browser_proxy") {
]
}
js_library("chrome_app_permission_view") {
js_library("chrome_app_detail_view") {
deps = [
":fake_page_handler",
":pin_to_shelf_item",
......@@ -145,7 +145,7 @@ js_library("pin_to_shelf_item") {
]
}
js_library("pwa_permission_view") {
js_library("pwa_detail_view") {
deps = [
":constants",
":fake_page_handler",
......
<link rel="import" href="chrome://resources/html/polymer.html">
<link rel="import" href="dom_switch.html">
<link rel="import" href="pwa_permission_view.html">
<link rel="import" href="arc_permission_view.html">
<link rel="import" href="chrome_app_permission_view.html">
<link rel="import" href="pwa_detail_view.html">
<link rel="import" href="arc_detail_view.html">
<link rel="import" href="chrome_app_detail_view.html">
<link rel="import" href="../../../settings_shared_css.html">
<dom-module id="app-management-app-permission-view">
<dom-module id="app-management-app-detail-view">
<template>
<style include="settings-shared">
</style>
<app-management-dom-switch id="view-selector"
route="[[getSelectedRouteId_(app_)]]">
<template>
<app-management-pwa-permission-view route-id="pwa-permission-view">
</app-management-pwa-permission-view>
<app-management-arc-permission-view route-id="arc-permission-view">
</app-management-arc-permission-view>
<app-management-chrome-app-permission-view
route-id="chrome-app-permission-view">
</app-management-chrome-app-permission-view>
<app-management-pwa-detail-view route-id="pwa-detail-view">
</app-management-pwa-detail-view>
<app-management-arc-detail-view route-id="arc-detail-view">
</app-management-arc-detail-view>
<app-management-chrome-app-detail-view
route-id="chrome-app-detail-view">
</app-management-chrome-app-detail-view>
</template>
</app-management-dom-switch>
</template>
<script src="app_permission_view.js"></script>
<script src="app_detail_view.js"></script>
</dom-module>
......@@ -3,8 +3,7 @@
// found in the LICENSE file.
Polymer({
// TODO(crbug.com/999016): change to app-management-app-detail-view.
is: 'app-management-app-permission-view',
is: 'app-management-app-detail-view',
behaviors: [
app_management.StoreClient,
......@@ -87,11 +86,11 @@ Polymer({
const selectedAppType = app.type;
switch (selectedAppType) {
case (AppType.kWeb):
return 'pwa-permission-view';
return 'pwa-detail-view';
case (AppType.kExtension):
return 'chrome-app-permission-view';
return 'chrome-app-detail-view';
case (AppType.kArc):
return 'arc-permission-view';
return 'arc-detail-view';
default:
assertNotReached();
}
......
......@@ -9,7 +9,7 @@
<link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html">
<link rel="import" href="chrome://resources/cr_elements/icons.html">
<dom-module id="app-management-arc-permission-view">
<dom-module id="app-management-arc-detail-view">
<template>
<style include="app-management-shared-css">
#no-permissions {
......@@ -84,5 +84,5 @@
</div>
</div>
</template>
<script src="arc_permission_view.js"></script>
<script src="arc_detail_view.js"></script>
</dom-module>
......@@ -2,8 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
Polymer({
// TODO(crbug.com/999016): change to app-management-arc-detail-view.
is: 'app-management-arc-permission-view',
is: 'app-management-arc-detail-view',
behaviors: [
app_management.StoreClient,
......
......@@ -6,7 +6,7 @@
<link rel="import" href="pin_to_shelf_item.html">
<link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html">
<dom-module id="app-management-chrome-app-permission-view">
<dom-module id="app-management-chrome-app-detail-view">
<template>
<style include="app-management-shared-css">
......@@ -82,5 +82,5 @@
</div>
</div>
</template>
<script src="chrome_app_permission_view.js"></script>
<script src="chrome_app_detail_view.js"></script>
</dom-module>
......@@ -2,8 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
Polymer({
// TODO(crbug.com/999016): change to app-management-chrome-app-detail-view.
is: 'app-management-chrome-app-permission-view',
is: 'app-management-chrome-app-detail-view',
behaviors: [
app_management.StoreClient,
......
......@@ -9,7 +9,7 @@
<link rel="import" href="chrome://resources/cr_elements/cr_icon_button/cr_icon_button.html">
<link rel="import" href="chrome://resources/cr_elements/icons.html">
<dom-module id="app-management-pwa-permission-view">
<dom-module id="app-management-pwa-detail-view">
<template>
<style include="app-management-shared-css">
</style>
......@@ -60,5 +60,5 @@
</div>
</div>
</template>
<script src="pwa_permission_view.js"></script>
<script src="pwa_detail_view.js"></script>
</dom-module>
......@@ -2,8 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
Polymer({
// TODO(crbug.com/999016): change to app-management-pwa-detail-view.
is: 'app-management-pwa-permission-view',
is: 'app-management-pwa-detail-view',
behaviors: [
app_management.StoreClient,
......
......@@ -15,7 +15,7 @@
<link rel="import" href="../../settings_shared_css.html">
<link rel="import" href="../../settings_shared_css.html">
<link rel="import" href="app_management_page/app_management_page.html">
<link rel="import" href="app_management_page/app_permission_view.html">
<link rel="import" href="app_management_page/app_detail_view.html">
<link rel="import" href="app_management_page/uninstall_button.html">
<!-- Changes to the android sections of this file should be reflected in
......@@ -97,8 +97,8 @@
title-icon="[[iconUrlFromId_(app_)]]">
<app-management-uninstall-button slot="subpage-title-extra">
</app-management-uninstall-button>
<app-management-app-permission-view>
</app-management-app-permission-view>
<app-management-app-detail-view>
</app-management-app-detail-view>
</settings-subpage>
</template>
</template>
......
......@@ -109,11 +109,11 @@
<structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_DOM_SWITCH_HTML"
file="chromeos/os_apps_page/app_management_page/dom_switch.html"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_PWA_PERMISSION_VIEW_JS"
file="chromeos/os_apps_page/app_management_page/pwa_permission_view.js"
<structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_PWA_DETAIL_VIEW_JS"
file="chromeos/os_apps_page/app_management_page/pwa_detail_view.js"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_PWA_PERMISSION_VIEW_HTML"
file="chromeos/os_apps_page/app_management_page/pwa_permission_view.html"
<structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_PWA_DETAIL_VIEW_HTML"
file="chromeos/os_apps_page/app_management_page/pwa_detail_view.html"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_PERMISSION_ITEM_JS"
file="chromeos/os_apps_page/app_management_page/permission_item.js"
......@@ -133,23 +133,23 @@
<structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_TOGGLE_ROW_HTML"
file="chromeos/os_apps_page/app_management_page/toggle_row.html"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_APP_PERMISSION_VIEW_JS"
file="chromeos/os_apps_page/app_management_page/app_permission_view.js"
<structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_APP_DETAIL_VIEW_JS"
file="chromeos/os_apps_page/app_management_page/app_detail_view.js"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_APP_PERMISSION_VIEW_HTML"
file="chromeos/os_apps_page/app_management_page/app_permission_view.html"
<structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_APP_DETAIL_VIEW_HTML"
file="chromeos/os_apps_page/app_management_page/app_detail_view.html"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_ARC_PERMISSION_VIEW_JS"
file="chromeos/os_apps_page/app_management_page/arc_permission_view.js"
<structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_ARC_DETAIL_VIEW_JS"
file="chromeos/os_apps_page/app_management_page/arc_detail_view.js"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_ARC_PERMISSION_VIEW_HTML"
file="chromeos/os_apps_page/app_management_page/arc_permission_view.html"
<structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_ARC_DETAIL_VIEW_HTML"
file="chromeos/os_apps_page/app_management_page/arc_detail_view.html"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_CHROME_APP_PERMISSION_VIEW_JS"
file="chromeos/os_apps_page/app_management_page/chrome_app_permission_view.js"
<structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_CHROME_APP_DETAIL_VIEW_JS"
file="chromeos/os_apps_page/app_management_page/chrome_app_detail_view.js"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_CHROME_APP_PERMISSION_VIEW_HTML"
file="chromeos/os_apps_page/app_management_page/chrome_app_permission_view.html"
<structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_CHROME_APP_DETAIL_VIEW_HTML"
file="chromeos/os_apps_page/app_management_page/chrome_app_detail_view.html"
type="chrome_html" />
<structure name="IDR_OS_SETTINGS_APP_MANAGEMENT_PAGE_ICONS_HTML"
file="chromeos/os_apps_page/app_management_page/icons.html"
......
......@@ -33,7 +33,7 @@ suite('<app-management-app>', () => {
/** @return {boolean} */
function isDetailViewShown() {
return !!app.$$('app-management-pwa-permission-view');
return !!app.$$('app-management-pwa-detail-view');
}
setup(async () => {
......@@ -81,8 +81,8 @@ suite('<app-management-app>', () => {
});
// Click back button to go to main page.
app.$$('app-management-pwa-permission-view')
.$$('app-management-permission-view-header')
app.$$('app-management-pwa-detail-view')
.$$('app-management-detail-view-header')
.$$('#backButton')
.click();
test_util.flushTasks();
......
......@@ -4,7 +4,7 @@
'use strict';
suite('<app-management-arc-permission-view>', () => {
suite('<app-management-arc-detail-view>', () => {
let arcPermissionView;
let fakeHandler;
......@@ -51,7 +51,7 @@ suite('<app-management-arc-permission-view>', () => {
app_management.actions.updateSelectedAppId(app.id));
arcPermissionView =
document.createElement('app-management-arc-permission-view');
document.createElement('app-management-arc-detail-view');
replaceBody(arcPermissionView);
});
......
......@@ -35,8 +35,7 @@ suite('<app-management-managed-apps>', () => {
// Select created app.
app_management.Store.getInstance().dispatch(
app_management.actions.updateSelectedAppId(app.id));
appDetailView =
document.createElement('app-management-pwa-permission-view');
appDetailView = document.createElement('app-management-pwa-detail-view');
replaceBody(appDetailView);
await test_util.flushTasks();
});
......@@ -44,7 +43,7 @@ suite('<app-management-managed-apps>', () => {
// TODO(crbug.com/999412): rewrite test.
test.skip('Uninstall button affected by policy', () => {
const uninstallWrapper =
appDetailView.$$('app-management-permission-view-header')
appDetailView.$$('app-management-detail-view-header')
.$$('#uninstall-wrapper');
expectTrue(!!uninstallWrapper.querySelector('#policy-indicator'));
});
......
......@@ -4,7 +4,7 @@
'use strict';
suite('<app-management-pwa-permission-view>', function() {
suite('<app-management-pwa-detail-view>', function() {
let pwaPermissionView;
let fakeHandler;
......@@ -33,7 +33,7 @@ suite('<app-management-pwa-permission-view>', function() {
app_management.actions.updateSelectedAppId(app.id));
pwaPermissionView =
document.createElement('app-management-pwa-permission-view');
document.createElement('app-management-pwa-detail-view');
replaceBody(pwaPermissionView);
});
......
......@@ -209,45 +209,45 @@ TEST_F('OSSettingsAppManagementPageTest', 'AllJsTests', () => {
mocha.run();
});
// Test fixture for the app management pwa permission view element.
// Test fixture for the app management pwa detail view element.
// eslint-disable-next-line no-var
var OSSettingsAppManagementPwaPermissionViewTest =
var OSSettingsAppManagementPwaDetailViewTest =
class extends OSSettingsAppManagementBrowserTest {
/** @override */
get browsePreload() {
return super.browsePreload + 'app_management/pwa_permission_view.html';
return super.browsePreload + 'app_management/pwa_detail_view.html';
}
/** @override */
get extraLibraries() {
return super.extraLibraries.concat([
'app_management/pwa_permission_view_test.js',
'app_management/pwa_detail_view_test.js',
]);
}
};
TEST_F('OSSettingsAppManagementPwaPermissionViewTest', 'AllJsTests', () => {
TEST_F('OSSettingsAppManagementPwaDetailViewTest', 'AllJsTests', () => {
mocha.run();
});
// Test fixture for the app management arc permission view element.
// Test fixture for the app management arc detail view element.
// eslint-disable-next-line no-var
var OSSettingsAppManagementArcPermissionViewTest =
var OSSettingsAppManagementArcDetailViewTest =
class extends OSSettingsAppManagementBrowserTest {
/** @override */
get browsePreload() {
return super.browsePreload + 'app_management/arc_permission_view.html';
return super.browsePreload + 'app_management/arc_detail_view.html';
}
/** @override */
get extraLibraries() {
return super.extraLibraries.concat([
'app_management/arc_permission_view_test.js',
'app_management/arc_detail_view_test.js',
]);
}
};
TEST_F('OSSettingsAppManagementArcPermissionViewTest', 'AllJsTests', () => {
TEST_F('OSSettingsAppManagementArcDetailViewTest', 'AllJsTests', () => {
mocha.run();
});
......@@ -257,7 +257,7 @@ var OSSettingsAppManagementManagedAppTest =
class extends OSSettingsAppManagementBrowserTest {
/** @override */
get browsePreload() {
return super.browsePreload + 'app_management/pwa_permission_view.html';
return super.browsePreload + 'app_management/pwa_detail_view.html';
}
/** @override */
......
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