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

Unified Diff: chrome/browser/ui/libgtk2ui/gtk2_border.h

Issue 298813002: views: Move MenuButton from TextButton to LabelButton. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix the NewAvatarButton by restricting space in LabelButton. Created 6 years, 6 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/libgtk2ui/gtk2_border.h
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_border.h b/chrome/browser/ui/libgtk2ui/gtk2_border.h
index ca1fcd48b6aa36fe8c0600eae0ec6176d9113c79..ebd41bfe9239cfc51e5d7bdb82c056c8083a5618 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_border.h
+++ b/chrome/browser/ui/libgtk2ui/gtk2_border.h
@@ -18,7 +18,7 @@ class Canvas;
namespace views {
class LabelButton;
-class Border;
+class LabelButtonBorder;
}
namespace libgtk2ui {
@@ -29,7 +29,7 @@ class Gtk2Border : public views::Border, public ui::NativeThemeObserver {
public:
Gtk2Border(Gtk2UI* gtk2_ui,
views::LabelButton* owning_button,
- scoped_ptr<views::Border> border);
+ scoped_ptr<views::LabelButtonBorder> border);
virtual ~Gtk2Border();
// Overridden from views::Border:
@@ -46,8 +46,6 @@ class Gtk2Border : public views::Border, public ui::NativeThemeObserver {
const gfx::Rect& rect,
gfx::Canvas* canvas);
- bool ShouldDrawBorder(bool focused, views::Button::ButtonState state);
-
Gtk2UI* gtk2_ui_;
gfx::ImageSkia button_images_[2][views::Button::STATE_COUNT];
@@ -58,7 +56,7 @@ class Gtk2Border : public views::Border, public ui::NativeThemeObserver {
// The views::Border that we are replacing in native mode. We keep track of
// this for inset information.
- scoped_ptr<views::Border> border_;
+ scoped_ptr<views::LabelButtonBorder> border_;
ScopedObserver<ui::NativeTheme, ui::NativeThemeObserver> observer_manager_;
« no previous file with comments | « no previous file | chrome/browser/ui/libgtk2ui/gtk2_border.cc » ('j') | chrome/browser/ui/libgtk2ui/gtk2_border.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698