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

Unified Diff: chrome/browser/resources/settings/bluetooth_page/bluetooth_subpage.html

Issue 2848443002: MD Settings: Remove usage of deprecated iron-flex-layout.html, for CrOS. (Closed)
Patch Set: Address more 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: chrome/browser/resources/settings/bluetooth_page/bluetooth_subpage.html
diff --git a/chrome/browser/resources/settings/bluetooth_page/bluetooth_subpage.html b/chrome/browser/resources/settings/bluetooth_page/bluetooth_subpage.html
index e5bd151c7d75bb522654567b0d42975a274fd817..769121ff62471a985ea9938f32ba3c8f25f85998 100644
--- a/chrome/browser/resources/settings/bluetooth_page/bluetooth_subpage.html
+++ b/chrome/browser/resources/settings/bluetooth_page/bluetooth_subpage.html
@@ -1,7 +1,6 @@
<link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.html">
<link rel="import" href="chrome://resources/html/i18n_behavior.html">
<link rel="import" href="chrome://resources/html/polymer.html">
-<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classes/iron-flex-layout.html">
<link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spinner.html">
<link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/paper-toggle-button.html">
@@ -13,9 +12,11 @@
<dom-module id="settings-bluetooth-subpage">
<template>
- <style include="settings-shared">
+ <style include="settings-shared iron-flex">
.container {
@apply(--settings-list-frame-padding);
+ display: flex;
+ flex-direction: column;
min-height: 10px;
overflow-y: auto;
}
@@ -57,7 +58,7 @@
hidden="[[!showNoDevices_(bluetoothToggleState, pairedDeviceList_)]]">
$i18n{bluetoothNoDevices}
</div>
- <div id="pairedContainer" class="container layout vertical"
+ <div id="pairedContainer" class="container"
scrollable on-device-event="onDeviceEvent_"
hidden="[[!showDevices_(bluetoothToggleState, pairedDeviceList_)]]">
<iron-list id="pairedDevices" class="vertical-list"
@@ -82,7 +83,7 @@
hidden="[[!showNoDevices_(bluetoothToggleState, unpairedDeviceList_)]]">
$i18n{bluetoothNoDevicesFound}
</div>
- <div id="unpairedContainer" class="container layout vertical"
+ <div id="unpairedContainer" class="container"
scrollable on-device-event="onDeviceEvent_"
hidden="[[!showDevices_(bluetoothToggleState, unpairedDeviceList_)]]">
<iron-list id="unpairedDevices" class="vertical-list"

Powered by Google App Engine
This is Rietveld 408576698