Add stub icons for playpen.

+remove separators in creation dialogs.

TBR=derat@chromium.org, nkostylev@chromium.org, oshima@chromium.org

NOTRY=true
Because of changes in binaries.
BUG=229762

Review URL: https://codereview.chromium.org/16103006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202936 0039d316-1c4b-4281-b951-d872f2087c98

ash/resources/ash_resources.grd

@@ -130,6 +130,7 @@
       <!-- ChromeOS specific icons -->
       <if expr="pp_ifdef('chromeos')">
         <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_ENTERPRISE_DARK" file="cros/status/status_managed.png" />
+        <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_MANAGED_USER" file="cros/status/status_managed_mode_user.png" />
         <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_1X" file="cros/network/statusbar_network_1x.png" />
         <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_3G_DARK" file="cros/network/statusbar_network_3g_dark.png" />
         <structure type="chrome_scaled_image" name="IDR_AURA_UBER_TRAY_NETWORK_3G_LIGHT" file="cros/network/statusbar_network_3g_light.png" />

ash/system/chromeos/managed/tray_locally_managed_user.cc

@@ -32,9 +32,8 @@ class ManagedUserNotificationView : public TrayNotificationView {
 
  private:
   void CreateMessageView() {
-    // TODO(antrim): replace to appropriate icon when there is one.
     message_view_ = new LabelTrayView(tray_managed_,
-                                      IDR_AURA_UBER_TRAY_ENTERPRISE_DARK);
+                                      IDR_AURA_UBER_TRAY_MANAGED_USER);
     base::string16 message = Shell::GetInstance()->system_tray_delegate()->
         GetLocallyManagedUserMessage();
     message_view_->SetMessage(message);
@@ -81,8 +80,7 @@ views::View* TrayLocallyManagedUser::CreateDefaultView(
   if (status != ash::user::LOGGED_IN_LOCALLY_MANAGED)
     return NULL;
 
-  // TODO(antrim): replace to appropriate icon when there is one.
-  tray_view_ = new LabelTrayView(this, IDR_AURA_UBER_TRAY_ENTERPRISE_DARK);
+  tray_view_ = new LabelTrayView(this, IDR_AURA_UBER_TRAY_MANAGED_USER);
   UpdateMessage();
   return tray_view_;
 }

chrome/app/theme/theme_resources.grd

@@ -468,6 +468,9 @@
         <structure type="chrome_scaled_image" name="IDR_LOGIN_PASSWORD_CAPS_LOCK" file="login_password_capslock.png" />
       </if>
       <structure type="chrome_scaled_image" name="IDR_MANAGED" file="managed_small.png" />
+      <if expr="pp_ifdef('chromeos')">
+        <structure type="chrome_scaled_image" name="IDR_MANAGED_MODE_ICON" file="cros/managed_mode_icon.png" />
+      </if>
       <structure type="chrome_scaled_image" name="IDR_MAXIMIZE_BUTTON_MASK" file="maximize_button_mask.png" />
       <structure type="chrome_scaled_image" name="IDR_MINIMIZE_BUTTON_MASK" file="minimize_button_mask.png" />
       <if expr="pp_ifdef('chromeos')">

chrome/browser/resources/chromeos/login/screen_gaia_signin.html

@@ -18,7 +18,7 @@
       <div id="createManagedUserPane" class="signin-text">
         <div id="createManagedUserSeparator"></div>
         <div id="createManagedUserLogo">
-          <img src="chrome://theme/IDR_OOBE_ACTION_BOX_BUTTON_NORMAL">
+          <img src="chrome://theme/IDR_MANAGED_MODE_ICON">
           <span i18n-content="createManagedUserFeatureName"></span>
         </div>
         <div id="createManagedUserLinkPlaceholder"></div>

chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.css

@@ -5,13 +5,6 @@
  * This is the stylesheet used by the Locally managed user creation flow screen.
  */
 
-.screen-horizontal-splitter {
-  background: -webkit-linear-gradient(rgba(128,128,128,0),
-                                      rgba(128,128,128,0.3));
-  height: 10px;
-  width: 100%;
-}
-
 #managed-user-creation-flow {
   height: 488px;
   padding: 70px 17px 50px;

chrome/browser/resources/chromeos/login/screen_locally_managed_user_creation.html

@@ -5,7 +5,6 @@
       <div id="managed-user-creation-flow-intro-placeholder">
         Lorem ipsum dolor...
       </div>
-      <div class="screen-horizontal-splitter"></div>
       <div id="managed-user-creation-flow-intro-text-1">
         Some text on TBD mode.
         Lorem ipsum dolor sit amet, consectetur adipisicing elit,
@@ -56,7 +55,6 @@
       <div id="managed-user-creation-flow-tutorial-placeholder">
         Lorem ipsum dolor...
       </div>
-      <div class="screen-horizontal-splitter"></div>
       <div id="managed-user-creation-flow-tutorial-created-text"></div>
       <div id="managed-user-creation-flow-tutorial-instructions-text"></div>
     </div>

chrome/browser/resources/chromeos/login/user_pod_row.css

@@ -222,7 +222,7 @@ html[dir=rtl] .pod .capslock-hint {
 
 .user-type-icon-image {
   background-color: transparent;
-  background-image: url('chrome://theme/IDR_OOBE_ACTION_BOX_BUTTON_NORMAL');
+  background-image: url('chrome://theme/IDR_MANAGED_MODE_ICON');
   border: 0 !important;
   height: 16px;
   margin: 5px;
@@ -230,7 +230,6 @@ html[dir=rtl] .pod .capslock-hint {
   width: 16px;
 }
 
-
 html[dir=rtl] .action-box-area {
   left: 0;
   right: auto;