Settings People Revamp: Implement parts of ChromeOS Change Picture

chrome/browser/resources/settings/people_page/people_page.html

Index: chrome/browser/resources/settings/people_page/people_page.html
diff --git a/chrome/browser/resources/settings/people_page/people_page.html b/chrome/browser/resources/settings/people_page/people_page.html
index d21fd026abc08ae345927d0b9e0df72a93364358..9197e99a033dd56cf68bdfa935ff92fd99a7e9ef 100644
--- a/chrome/browser/resources/settings/people_page/people_page.html
+++ b/chrome/browser/resources/settings/people_page/people_page.html
@@ -4,15 +4,18 @@
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-checkbox.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dialog.html">
-<link rel="import" href="chrome://md-settings/people_page/manage_profile.html">
 <link rel="import" href="chrome://md-settings/people_page/sync_page.html">
 <link rel="import" href="chrome://md-settings/people_page/sync_private_api.html">
 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pages.html">
 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.html">
 
 <if expr="chromeos">
+<link rel="import" href="chrome://md-settings/people_page/change_picture.html">
 <link rel="import" href="chrome://md-settings/people_page/users_page.html">
 </if>
+<if expr="not chromeos">
+<link rel="import" href="chrome://md-settings/people_page/manage_profile.html">
+</if>
 
 <dom-module id="settings-people-page">
   <link rel="import" type="css" href="chrome://md-settings/settings_shared.css">
@@ -23,9 +26,19 @@
       <neon-animatable id="main">
         <div class="settings-box">
           <div class="split">
-            <span class="start" on-tap="onManageProfileTap_">
-              <img id="account-picture" src="[[profileIconUrl_]]">
-              [[profileName_]]
+            <span class="start">
+              <img id="account-picture" src="[[profileIconUrl_]]"
+                  on-tap="onPictureTap_">
+<if expr="chromeos">
+              <span id="profile-name" on-tap="onProfileNameTap_">
+                [[profileName_]]
+              </span>
+</if>
+<if expr="not chromeos">
+              <span id="profile-name">
+                [[profileName_]]
+              </span>
+</if>
             </span>
             <span>
               <template is="dom-if" if="[[!syncStatus.signedIn]]">
@@ -79,6 +92,11 @@
         <settings-subheader i18n-values="page-title:usersPageTitle">
         </settings-subheader>
         <settings-users-page prefs="{{prefs}}"></settings-users-page>
+      </neon-animatable>
+      <neon-animatable id="changePicture">
+        <settings-subheader i18n-values="page-title:changePictureTitle">
+        </settings-subheader>
+        <settings-change-picture></settings-change-picture>
       <neon-animatable>
 </if>
 <if expr="not chromeos">