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

Unified Diff: ash/common/system/tray/tray_constants.cc

Issue 2460443002: Revert of "Added common layout framework for system menu rows." (Closed)
Patch Set: Created 4 years, 2 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
« no previous file with comments | « ash/common/system/tray/tray_constants.h ('k') | ash/common/system/tray/tray_popup_layout_factory.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/system/tray/tray_constants.cc
diff --git a/ash/common/system/tray/tray_constants.cc b/ash/common/system/tray/tray_constants.cc
index 489ff1ca9a1415000a25b7bde6a2e27f8d15ed25..c8718ccba4a3879bd40a42e6b87140a89956f4fd 100644
--- a/ash/common/system/tray/tray_constants.cc
+++ b/ash/common/system/tray/tray_constants.cc
@@ -97,14 +97,6 @@
const int kTraySpacing[] = {4, 4, 0};
const int kTrayPaddingFromEdgeOfShelf[] = {3, 3, 4};
const int kTrayPopupItemHeight[] = {46, 46, 48};
- // TODO(bruthig): Use the correct values for non-material design.
- const int kTrayPopupItemLeftInset[] = {0, 0, 4};
- // TODO(bruthig): Use the correct values for non-material design.
- const int kTrayPopupItemRightInset[] = {0, 0, 4};
- // TODO(bruthig): Use the correct values for non-material design.
- const int kTrayPopupItemMinStartWidth[] = {48, 48, 48};
- // TODO(bruthig): Use the correct values for non-material design.
- const int kTrayPopupItemMinEndWidth[] = {48, 48, 48};
const int kVirtualKeyboardButtonSize[] = {39, 39, kTrayItemSize};
const int kTrayImeMenuIcon[] = {40, 40, kTrayItemSize};
const int kTrayImageItemPadding[] = {1, 1, 3};
@@ -122,14 +114,6 @@
return kTrayPaddingFromEdgeOfShelf[mode];
case TRAY_POPUP_ITEM_HEIGHT:
return kTrayPopupItemHeight[mode];
- case TRAY_POPUP_ITEM_LEFT_INSET:
- return kTrayPopupItemLeftInset[mode];
- case TRAY_POPUP_ITEM_RIGHT_INSET:
- return kTrayPopupItemRightInset[mode];
- case TRAY_POPUP_ITEM_MIN_START_WIDTH:
- return kTrayPopupItemMinStartWidth[mode];
- case TRAY_POPUP_ITEM_MIN_END_WIDTH:
- return kTrayPopupItemMinEndWidth[mode];
case VIRTUAL_KEYBOARD_BUTTON_SIZE:
return kVirtualKeyboardButtonSize[mode];
case TRAY_IME_MENU_ICON:
« no previous file with comments | « ash/common/system/tray/tray_constants.h ('k') | ash/common/system/tray/tray_popup_layout_factory.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698