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

Side by Side Diff: ui/views/controls/button/text_button.h

Issue 24647003: Redesign of the avatar menu button. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: better fix for app/popup browser crash Created 7 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 unified diff | Download patch
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_ 5 #ifndef UI_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
6 #define UI_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_ 6 #define UI_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 // Note that this type of button is not focusable by default and will not be 58 // Note that this type of button is not focusable by default and will not be
59 // part of the focus chain. Call set_focusable(true) to make it part of the 59 // part of the focus chain. Call set_focusable(true) to make it part of the
60 // focus chain. 60 // focus chain.
61 // 61 //
62 //////////////////////////////////////////////////////////////////////////////// 62 ////////////////////////////////////////////////////////////////////////////////
63 class VIEWS_EXPORT TextButtonDefaultBorder : public TextButtonBorder { 63 class VIEWS_EXPORT TextButtonDefaultBorder : public TextButtonBorder {
64 public: 64 public:
65 TextButtonDefaultBorder(); 65 TextButtonDefaultBorder();
66 virtual ~TextButtonDefaultBorder(); 66 virtual ~TextButtonDefaultBorder();
67 67
68 protected:
69 // TextButtonDefaultBorder takes and retains ownership of these |painter|s. 68 // TextButtonDefaultBorder takes and retains ownership of these |painter|s.
70 void set_normal_painter(Painter* painter) { normal_painter_.reset(painter); } 69 void set_normal_painter(Painter* painter) { normal_painter_.reset(painter); }
71 void set_hot_painter(Painter* painter) { hot_painter_.reset(painter); } 70 void set_hot_painter(Painter* painter) { hot_painter_.reset(painter); }
72 void set_pushed_painter(Painter* painter) { pushed_painter_.reset(painter); } 71 void set_pushed_painter(Painter* painter) { pushed_painter_.reset(painter); }
73 72
74 private: 73 private:
75 // Implementation of Border: 74 // Implementation of Border:
76 virtual void Paint(const View& view, gfx::Canvas* canvas) OVERRIDE; 75 virtual void Paint(const View& view, gfx::Canvas* canvas) OVERRIDE;
77 76
78 scoped_ptr<Painter> normal_painter_; 77 scoped_ptr<Painter> normal_painter_;
(...skipping 317 matching lines...) Expand 10 before | Expand all | Expand 10 after
396 // True if the button should ignore the minimum size for the platform. Default 395 // True if the button should ignore the minimum size for the platform. Default
397 // is true. Set to false to prevent narrower buttons. 396 // is true. Set to false to prevent narrower buttons.
398 bool ignore_minimum_size_; 397 bool ignore_minimum_size_;
399 398
400 DISALLOW_COPY_AND_ASSIGN(TextButton); 399 DISALLOW_COPY_AND_ASSIGN(TextButton);
401 }; 400 };
402 401
403 } // namespace views 402 } // namespace views
404 403
405 #endif // UI_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_ 404 #endif // UI_VIEWS_CONTROLS_BUTTON_TEXT_BUTTON_H_
OLDNEW
« no previous file with comments | « chrome/chrome_tests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698