chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html - Issue 2664503004: MD Settings: Make all HTML import href's relative.

Side by Side Diff: chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html

Issue 2664503004: MD Settings: Make all HTML import href's relative. (Closed)

Patch Set: resolve more conflicts Created 3 years, 10 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:

« no previous file with comments | « chrome/browser/resources/settings/bluetooth_page/bluetooth_device_list_item.html ('k') | chrome/browser/resources/settings/certificate_manager_page/ca_trust_edit_dialog.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html">	1 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html">

2 <link rel="import" href="chrome://resources/html/i18n_behavior.html">	2 <link rel="import" href="chrome://resources/html/i18n_behavior.html">

3 <link rel="import" href="chrome://resources/html/polymer.html">	3 <link rel="import" href="chrome://resources/html/polymer.html">

4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">	4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">

5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">	5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">

6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">	6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">

7 <link rel="import" href="/icons.html">	7 <link rel="import" href="../icons.html">

8 <link rel="import" href="/prefs/prefs.html">	8 <link rel="import" href="../prefs/prefs.html">

9 <link rel="import" href="/settings_page/settings_animated_pages.html">	9 <link rel="import" href="../settings_page/settings_animated_pages.html">

10 <link rel="import" href="/settings_page/settings_subpage.html">	10 <link rel="import" href="../settings_page/settings_subpage.html">

11 <link rel="import" href="/settings_shared_css.html">	11 <link rel="import" href="../settings_shared_css.html">

12 <link rel="import" href="bluetooth_subpage.html">	12 <link rel="import" href="bluetooth_subpage.html">

13	13

14 <dom-module id="settings-bluetooth-page">	14 <dom-module id="settings-bluetooth-page">

15 <template>	15 <template>

16 <style include="settings-shared">	16 <style include="settings-shared">

17 </style>	17 </style>

18 <settings-animated-pages id="pages" section="bluetooth">	18 <settings-animated-pages id="pages" section="bluetooth">

19 <neon-animatable route-path="default">	19 <neon-animatable route-path="default">

20 <div class="settings-box first" actionable on-tap="onTap_">	20 <div class="settings-box first" actionable on-tap="onTap_">

21 <iron-icon icon="[[getIcon_(bluetoothEnabled_)]]"></iron-icon>	21 <iron-icon icon="[[getIcon_(bluetoothEnabled_)]]"></iron-icon>

(...skipping 19 matching lines...) Expand all Loading...
41 bluetooth-private="[[bluetoothPrivate]]"	41 bluetooth-private="[[bluetoothPrivate]]"

42 show-spinner="{{showSpinner_}}">	42 show-spinner="{{showSpinner_}}">

43 </settings-bluetooth-subpage>	43 </settings-bluetooth-subpage>

44 </settings-subpage>	44 </settings-subpage>

45 </template>	45 </template>

46	46

47 </settings-animated-pages>	47 </settings-animated-pages>

48 </template>	48 </template>

49 <script src="bluetooth_page.js"></script>	49 <script src="bluetooth_page.js"></script>

50 </dom-module>	50 </dom-module>

OLD	NEW