Implement new design for expanded public session pod design

chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/sys_info.h"
@@ skipping 13 matching lines @@
 namespace chromeos {
 
 namespace {
 
 // JS functions that define new and old kiosk UI API.
 const char kKioskSetAppsNewAPI[] = "login.AccountPickerScreen.setApps";
 const char kKioskSetAppsOldAPI[] = "login.AppsMenuButton.setApps";
 const char kKioskShowErrorNewAPI[] = "login.AccountPickerScreen.showAppError";
 const char kKioskShowErrorOldAPI[] = "login.AppsMenuButton.showError";
 
-// Default app icon size.
-const char kDefaultAppIconSizeString[] = "96px";
-const int kMaxAppIconSize = 160;
-
 }  // namespace
 
 KioskAppMenuHandler::KioskAppMenuHandler(
     const scoped_refptr<NetworkStateInformer>& network_state_informer)
     : weak_ptr_factory_(this),
       is_webui_initialized_(false),
       network_state_informer_(network_state_informer) {
   KioskAppManager::Get()->AddObserver(this);
   network_state_informer_->AddObserver(this);
 }
@@ skipping 52 matching lines @@
   for (size_t i = 0; i < apps.size(); ++i) {
     const KioskAppManager::App& app_data = apps[i];
 
     scoped_ptr<base::DictionaryValue> app_info(new base::DictionaryValue);
     app_info->SetBoolean("isApp", true);
     app_info->SetString("id", app_data.app_id);
     app_info->SetString("label", app_data.name);
 
     // TODO(xiyuan): Replace data url with a URLDataSource.
     std::string icon_url("chrome://theme/IDR_APP_DEFAULT_ICON");
-
-    if (!app_data.icon.isNull()) {
+    if (!app_data.icon.isNull())
       icon_url = webui::GetBitmapDataUrl(*app_data.icon.bitmap());
-      int width = app_data.icon.width();
-      int height = app_data.icon.height();
-
-      // If app icon size is larger than default 160x160 then don't provide
-      // size at all since it's already limited on the css side.
-      if (width <= kMaxAppIconSize && height <= kMaxAppIconSize) {
-        app_info->SetString("iconWidth", base::IntToString(width) + "px");
-        app_info->SetString("iconHeight", base::IntToString(height) + "px");
-      }
-    } else {
-      app_info->SetString("iconWidth", kDefaultAppIconSizeString);
-      app_info->SetString("iconHeight", kDefaultAppIconSizeString);
-    }
     app_info->SetString("iconUrl", icon_url);
 
     apps_list.Append(app_info.release());
   }
 
   web_ui()->CallJavascriptFunction(EnableNewKioskUI() ?
       kKioskSetAppsNewAPI : kKioskSetAppsOldAPI,
       apps_list);
 }
 
@@ skipping 33 matching lines @@
 void KioskAppMenuHandler::OnKioskAppDataChanged(const std::string& app_id) {
   SendKioskApps();
 }
 
 void KioskAppMenuHandler::UpdateState(ErrorScreenActor::ErrorReason reason) {
   if (network_state_informer_->state() == NetworkStateInformer::ONLINE)
     KioskAppManager::Get()->RetryFailedAppDataFetch();
 }
 
 }  // namespace chromeos