Settings People Revamp: Implement parts of ChromeOS Change Picture

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

 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/polymer/polymer.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-animatable.html">
 <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">
   <link rel="import" type="css" href="people_page.css">
   <template>
     <settings-animated-pages id="pages" current-route="{{currentRoute}}"
         section="people">
       <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]]">
                 <paper-button on-tap="onSigninTap_" raised
                     disabled="[[syncStatus.setupInProgress]]">
                     [[i18n('syncSignin')]]
                 </paper-button>
               </template>
               <template is="dom-if" if="[[syncStatus.signedIn]]">
                 <paper-button on-tap="onDisconnectTap_"
@@ skipping 33 matching lines @@
         <settings-subheader i18n-values="page-title:syncPageTitle">
         </settings-subheader>
         <settings-sync-page current-route="[[currentRoute]]">
         </settings-sync-page>
       </neon-animatable>
 <if expr="chromeos">
       <neon-animatable id="users">
         <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">
       <neon-animatable id="manageProfile">
         <settings-subheader i18n-values="page-title:editPerson">
         </settings-subheader>
         <settings-manage-profile profile-icon-url="[[profileIconUrl_]]"
             profile-name="[[profileName_]]">
         </settings-manage-profile>
       <neon-animatable>
@@ skipping 12 matching lines @@
         <paper-button dialog-dismiss i18n-content="cancel">
         </paper-button>
         <paper-button dialog-confirm raised on-tap="onDisconnectConfirm_"
             i18n-content="syncDisconnectConfirm">
         </paper-button>
       </div>
     </paper-dialog>
   </template>
   <script src="people_page.js"></script>
 </dom-module>