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

Unified Diff: chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc

Issue 369893005: Implement new design for expanded public session pod design (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed ScreenLockerTest. Rebased. Created 6 years, 5 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/ui/webui/chromeos/login/kiosk_app_menu_handler.cc
diff --git a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc
index 4ab1f181d0306e39e6e191dc19f1d05fd1a5bdc2..476fe36e18559d0335b856530e03da413751bcd0 100644
--- a/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/kiosk_app_menu_handler.cc
@@ -31,10 +31,6 @@ 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(
@@ -107,22 +103,8 @@ void KioskAppMenuHandler::SendKioskApps() {
// 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());
« no previous file with comments | « chrome/browser/signin/screenlock_bridge.h ('k') | chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698