diff options
| author | jackhou@chromium.org <jackhou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-18 07:39:47 +0000 |
|---|---|---|
| committer | jackhou@chromium.org <jackhou@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-18 07:39:47 +0000 |
| commit | b64322872775e28dfe93acf0582d1c4ae986a354 (patch) | |
| tree | c6611d908ec364f0aa6bbbdee1be7051a19b4db6 /ui/message_center/views/notifier_settings_view.cc | |
| parent | ff7c73d89fed5d8f76ca4c8846fce18fab2bb197 (diff) | |
| download | chromium_src-b64322872775e28dfe93acf0582d1c4ae986a354.zip chromium_src-b64322872775e28dfe93acf0582d1c4ae986a354.tar.gz chromium_src-b64322872775e28dfe93acf0582d1c4ae986a354.tar.bz2 | |
Revert of views: Move MenuButton from TextButton to LabelButton. (https://codereview.chromium.org/298813002/)
Reason for revert:
This is causes ExtensionApiTest.Bookmarks to fail on Linux:
http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%281%29%2832%29/builds/5412
http://build.chromium.org/p/chromium.linux/builders/Linux%20Tests%20%28dbg%29%281%29/builds/32272
TBR=erg@chromium.org,msw@chromium.org,sky@chromium.org
NOTRY=true
NOTREECHECKS=true
Original issue's description:
> views: Move MenuButton from TextButton to LabelButton.
>
> This also converts the TextButtons in the BookmarkBarView to LabelButtons, since they need to have the same base class as MenuButton does. This also standardizes on fade eliding instead of fade eliding sometimes and ellipsis eliding in other cases.
>
> This patch has the effect that everything on the bookmark bar also renders with GTK+ borders in GTK theme mode on Linux.
>
> BUG=155363
>
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=277878
Review URL: https://codereview.chromium.org/340003002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@277974 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/message_center/views/notifier_settings_view.cc')
| -rw-r--r-- | ui/message_center/views/notifier_settings_view.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/ui/message_center/views/notifier_settings_view.cc b/ui/message_center/views/notifier_settings_view.cc index a282ccb..5a46f48 100644 --- a/ui/message_center/views/notifier_settings_view.cc +++ b/ui/message_center/views/notifier_settings_view.cc @@ -28,7 +28,6 @@ #include "ui/views/controls/button/custom_button.h" #include "ui/views/controls/button/label_button_border.h" #include "ui/views/controls/button/menu_button.h" -#include "ui/views/controls/button/text_button.h" #include "ui/views/controls/image_view.h" #include "ui/views/controls/label.h" #include "ui/views/controls/link.h" |