diff options
| author | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 21:45:32 +0000 |
|---|---|---|
| committer | jennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-12 21:45:32 +0000 |
| commit | fda64c9e1866aff130c885c54431ee6b7d011788 (patch) | |
| tree | 8c657b471e3cca8da0a08741cd96e1ec1c12d406 /ash/system/chromeos | |
| parent | 9441d7b2475bcb6b4b1bda6f1c89a5ce62ddc9f6 (diff) | |
| download | chromium_src-fda64c9e1866aff130c885c54431ee6b7d011788.zip chromium_src-fda64c9e1866aff130c885c54431ee6b7d011788.tar.gz chromium_src-fda64c9e1866aff130c885c54431ee6b7d011788.tar.bz2 | |
Revert of Shelf Cleanup (- binary files) (https://codereview.chromium.org/176883022/)
Reason for revert:
This cl is breaking the app list launch bubble. see crbug.com/351776.
Original issue's description:
> Shelf Cleanup (- binary files)
>
> R=skuhne@chromium.org
> TBR=jamescook@chromium.org, miket@chromium.org, skuhne@chromium.org
> BUG=338429
>
> re-landing of
> https://codereview.chromium.org/140323010/ hopefully this time with less breaking everything.
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=256319
TBR=jamescook@chromium.org,skuhne@chromium.org,harrym@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=338429
Review URL: https://codereview.chromium.org/198063003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@256662 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/chromeos')
| -rw-r--r-- | ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc b/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc index a65ecc5..f1a9c5c 100644 --- a/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc +++ b/ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.cc @@ -4,7 +4,6 @@ #include "ash/system/chromeos/virtual_keyboard/virtual_keyboard_tray.h" -#include "ash/shelf/shelf_constants.h" #include "ash/shell.h" #include "ash/system/status_area_widget.h" #include "ash/system/tray/system_tray_notifier.h" @@ -44,7 +43,7 @@ VirtualKeyboardButton::~VirtualKeyboardButton() { } gfx::Size VirtualKeyboardButton::GetPreferredSize() { - const int virtual_keyboard_button_height = kShelfSize; + const int virtual_keyboard_button_height = GetShelfItemHeight(); gfx::Size size = ImageButton::GetPreferredSize(); int padding = virtual_keyboard_button_height - size.height(); size.set_height(virtual_keyboard_button_height); |