Commit 8af49901 authored by James Hawkins's avatar James Hawkins Committed by Commit Bot

OS Settings: Convert InternetPageBrowserProxy to Polymer 3.

R=khorimoto@chromium.org

Bug: 1045266
Test: none
Change-Id: I82ca433269e300a2e7745b661be3f7a85f8117a5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2425325
Commit-Queue: James Hawkins <jhawkins@chromium.org>
Reviewed-by: default avatarKyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/heads/master@{#809699}
parent af815dfb
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
import("//chrome/browser/resources/settings/chromeos/os_settings.gni") import("//chrome/browser/resources/settings/chromeos/os_settings.gni")
import("//third_party/closure_compiler/compile_js.gni") import("//third_party/closure_compiler/compile_js.gni")
import("//ui/webui/resources/tools/js_modulizer.gni")
js_type_check("closure_compile") { js_type_check("closure_compile") {
deps = [ deps = [
...@@ -185,7 +186,7 @@ js_type_check("closure_compile_module") { ...@@ -185,7 +186,7 @@ js_type_check("closure_compile_module") {
# ":internet_detail_page.m", # ":internet_detail_page.m",
":internet_known_networks_page.m", ":internet_known_networks_page.m",
# ":internet_page.m", # ":internet_page.m",
# ":internet_page_browser_proxy.m", ":internet_page_browser_proxy.m",
":internet_shared_css.m", ":internet_shared_css.m",
# ":internet_subpage.m", # ":internet_subpage.m",
# ":network_proxy_section.m", # ":network_proxy_section.m",
...@@ -402,8 +403,7 @@ polymer_modulizer("cellular_setup_dialog") { ...@@ -402,8 +403,7 @@ polymer_modulizer("cellular_setup_dialog") {
html_type = "dom-module" html_type = "dom-module"
} }
import("//ui/webui/resources/tools/js_modulizer.gni")
js_modulizer("modulize") { js_modulizer("modulize") {
input_files = [ "internet_page_browser_proxy.js" ] input_files = [ "internet_page_browser_proxy.js" ]
namespace_rewrites = os_settings_namespace_rewrites
} }
...@@ -2,10 +2,14 @@ ...@@ -2,10 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
// clang-format off
// #import {addSingletonGetter, addWebUIListener} from 'chrome://resources/js/cr.m.js';
// clang-format on
/** @fileoverview A helper object used for Internet page. */ /** @fileoverview A helper object used for Internet page. */
cr.define('settings', function() { cr.define('settings', function() {
/** @interface */ /** @interface */
class InternetPageBrowserProxy { /* #export */ class InternetPageBrowserProxy {
/** /**
* Shows the Cellular activation UI. * Shows the Cellular activation UI.
* @param {string} guid * @param {string} guid
...@@ -47,7 +51,7 @@ cr.define('settings', function() { ...@@ -47,7 +51,7 @@ cr.define('settings', function() {
/** /**
* @implements {settings.InternetPageBrowserProxy} * @implements {settings.InternetPageBrowserProxy}
*/ */
class InternetPageBrowserProxyImpl { /* #export */ class InternetPageBrowserProxyImpl {
/** @override */ /** @override */
showCellularSetupUI(guid) { showCellularSetupUI(guid) {
chrome.send('showCellularSetupUI', [guid]); chrome.send('showCellularSetupUI', [guid]);
......
...@@ -32,6 +32,7 @@ os_settings_namespace_rewrites = settings_namespace_rewrites + ...@@ -32,6 +32,7 @@ os_settings_namespace_rewrites = settings_namespace_rewrites +
"settings.FingerprintResultType|FingerprintResultType", "settings.FingerprintResultType|FingerprintResultType",
"settings.FingerprintScan|FingerprintScan", "settings.FingerprintScan|FingerprintScan",
"settings.FingerprintSetupStep|FingerprintSetupStep", "settings.FingerprintSetupStep|FingerprintSetupStep",
"settings.InternetPageBrowserProxy|InternetPageBrowserProxy",
"settings.input_method_util.generateOptions|generateOptions", "settings.input_method_util.generateOptions|generateOptions",
"settings.input_method_util.getFirstPartyInputMethodEngineId|getFirstPartyInputMethodEngineId", "settings.input_method_util.getFirstPartyInputMethodEngineId|getFirstPartyInputMethodEngineId",
"settings.input_method_util.getOptionLabelName|getOptionLabelName", "settings.input_method_util.getOptionLabelName|getOptionLabelName",
......
...@@ -39,6 +39,7 @@ export {NearbySettings, NearbyShareSettingsBehavior} from '../shared/nearby_shar ...@@ -39,6 +39,7 @@ export {NearbySettings, NearbyShareSettingsBehavior} from '../shared/nearby_shar
export {AmbientModeBrowserProxyImpl} from './ambient_mode_page/ambient_mode_browser_proxy.m.js'; export {AmbientModeBrowserProxyImpl} from './ambient_mode_page/ambient_mode_browser_proxy.m.js';
export {AmbientModeTemperatureUnit, AmbientModeTopicSource} from './ambient_mode_page/constants.m.js'; export {AmbientModeTemperatureUnit, AmbientModeTopicSource} from './ambient_mode_page/constants.m.js';
export {bluetoothApis} from './bluetooth_page/bluetooth_page.m.js'; export {bluetoothApis} from './bluetooth_page/bluetooth_page.m.js';
export {InternetPageBrowserProxy, InternetPageBrowserProxyImpl} from './internet_page/internet_page_browser_proxy.m.js';
export {MultiDeviceBrowserProxy, MultiDeviceBrowserProxyImpl} from './multidevice_page/multidevice_browser_proxy.m.js'; export {MultiDeviceBrowserProxy, MultiDeviceBrowserProxyImpl} from './multidevice_page/multidevice_browser_proxy.m.js';
export {MultiDeviceFeature, MultiDeviceFeatureState, MultiDevicePageContentData, MultiDeviceSettingsMode, SmartLockSignInEnabledState} from './multidevice_page/multidevice_constants.m.js'; export {MultiDeviceFeature, MultiDeviceFeatureState, MultiDevicePageContentData, MultiDeviceSettingsMode, SmartLockSignInEnabledState} from './multidevice_page/multidevice_constants.m.js';
export {Account, NearbyAccountManagerBrowserProxy, NearbyAccountManagerBrowserProxyImpl} from './nearby_share_page/nearby_account_manager_browser_proxy.m.js'; export {Account, NearbyAccountManagerBrowserProxy, NearbyAccountManagerBrowserProxyImpl} from './nearby_share_page/nearby_account_manager_browser_proxy.m.js';
......
...@@ -45,6 +45,11 @@ ...@@ -45,6 +45,11 @@
use_base_dir="false" use_base_dir="false"
compress="false" compress="false"
type="BINDATA" /> type="BINDATA" />
<include name="IDR_OS_SETTINGS_INTERNET_PAGE_BROWSER_PROXY_M_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/internet_page/internet_page_browser_proxy.m.js"
use_base_dir="false"
compress="false"
type="BINDATA" />
<include name="IDR_OS_SETTINGS_INTERNET_SHARED_CSS_M_JS" <include name="IDR_OS_SETTINGS_INTERNET_SHARED_CSS_M_JS"
file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/internet_page/internet_shared_css.m.js" file="${root_gen_dir}/chrome/browser/resources/settings/chromeos/internet_page/internet_shared_css.m.js"
use_base_dir="false" use_base_dir="false"
......
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