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

Unified Diff: chrome/browser/resources/settings/settings_main/settings_main.html

Issue 1141603003: Convert cr-settings-main to Polymer 0.8 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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/settings_main/settings_main.html
diff --git a/chrome/browser/resources/settings/settings_main/settings_main.html b/chrome/browser/resources/settings/settings_main/settings_main.html
index ff51cefb8d17c963d5ca04a321ff5efefb945dad..ae1b5598c9cc20cde83e2a6ab9db94e3f26e553d 100644
--- a/chrome/browser/resources/settings/settings_main/settings_main.html
+++ b/chrome/browser/resources/settings/settings_main/settings_main.html
@@ -1,7 +1,8 @@
-<link rel="import" href="chrome://resources/polymer/polymer/polymer.html">
-<link rel="import" href="chrome://resources/polymer/core-animated-pages/core-animated-pages.html">
-<link rel="import" href="chrome://resources/polymer/core-transition/core-transition.html">
-<link rel="import" href="chrome://resources/polymer/paper-shadow/paper-shadow.html">
+<link rel="import" href="chrome://resources/polymer/v0_8/polymer/polymer.html">
+<link rel="import" href="chrome://resources/polymer/v0_8/iron-pages/iron-pages.html">
+<link rel="import" href="chrome://md-settings/routes.html">
+
+<!-- TODO: Uncomment pages as they are upgraded.
<link rel="import" href="chrome://md-settings/a11y_page/a11y_page.html">
<link rel="import" href="chrome://md-settings/date_time_page/date_time_page.html">
<link rel="import" href="chrome://md-settings/downloads_page/downloads_page.html">
@@ -9,41 +10,54 @@
<link rel="import" href="chrome://md-settings/internet_page/internet_detail_page.html">
<link rel="import" href="chrome://md-settings/search_engines_page/search_engines_page.html">
<link rel="import" href="chrome://md-settings/search_page/search_page.html">
-<link rel="import" href="chrome://md-settings/routes.html">
-<link rel="import" href="settings_main_style.html">
+-->
-<polymer-element name="cr-settings-main">
+<dom-module id="cr-settings-main">
+ <link rel="import" type="css" href="settings_main.css">
<template>
- <core-style ref="settingsMainStyle"></core-style>
<div id="mainContainer">
- <cr-settings-page-header selectedPage="{{$.pageContainer.selectedItem}}">
+ <cr-settings-page-header selectedPage="[[selectedPage]]">
Jeremy Klein 2015/05/12 18:18:39 selected-page?
michaelpg 2015/05/12 18:42:49 Done.
</cr-settings-page-header>
- <content select="core-icon-button"></content>
+ <content select="paper-icon-button"></content>
<more-route-selector selectedParams="{{params}}">
- <core-animated-pages id="pageContainer"
- on-core-select="{{onCoreSelect_}}" valueattr="PAGE_ID"
- transitions="cross-fade">
+ <iron-pages id="pageContainer" selectedItem="{{selectedPage}}"
Jeremy Klein 2015/05/12 18:18:39 should this be selected-item now?
michaelpg 2015/05/12 18:42:49 Done.
+ on-iron-select="onIronSelect_" attr-for-selected="PAGE_ID">
+ <!-- TODO: Uncomment pages as they are upgraded. -->
<if expr="chromeos">
+ <!--
<cr-settings-internet-page route="internet">
</cr-settings-internet-page>
+ -->
+ <!--
<cr-settings-internet-detail-page route="internet-detail"
subpage="true" guid="{{params.guid}}">
</cr-settings-internet-detail-page>
+ -->
</if>
+ <!--
<cr-settings-a11y-page prefs="{{prefs}}" route="a11y">
</cr-settings-a11y-page>
+ -->
<if expr="chromeos">
+ <!--
<cr-settings-date-time-page prefs="{{prefs}}" route="dateTime">
</cr-settings-date-time-page>
</if>
+ -->
+ <!--
<cr-settings-downloads-page prefs="{{prefs}}" route="downloads">
</cr-settings-downloads-page>
+ -->
+ <!--
<cr-settings-search-page prefs="{{prefs}}" route="search">
</cr-settings-search-page>
+ -->
+ <!--
<cr-settings-search-engines-page prefs="{{prefs}}"
route="search-engines">
</cr-settings-search-engines-page>
- </core-animated-pages>
+ -->
+ </iron-pages>
</more-route-selector>
</div>
</template>

Powered by Google App Engine
This is Rietveld 408576698