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

Side by Side Diff: ui/views/controls/button/button.cc

Issue 132023010: linux_aura: Fixes a couple of issues with the button border integration. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: msw Created 6 years, 11 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #include "ui/views/controls/button/button.h" 5 #include "ui/views/controls/button/button.h"
6 6
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "ui/base/accessibility/accessible_view_state.h" 8 #include "ui/base/accessibility/accessible_view_state.h"
9 9
10 namespace views { 10 namespace views {
11 11
12 //////////////////////////////////////////////////////////////////////////////// 12 ////////////////////////////////////////////////////////////////////////////////
13 // Button, static public:
14
15 // static
16 Button::ButtonState Button::GetButtonStateFrom(ui::NativeTheme::State state) {
17 switch (state) {
18 case ui::NativeTheme::kDisabled: return Button::STATE_DISABLED;
19 case ui::NativeTheme::kHovered: return Button::STATE_HOVERED;
20 case ui::NativeTheme::kNormal: return Button::STATE_NORMAL;
21 case ui::NativeTheme::kPressed: return Button::STATE_PRESSED;
22 case ui::NativeTheme::kMaxState: NOTREACHED() << "Unknown state: " << state;
23 }
24 return Button::STATE_NORMAL;
25 }
26
27 ////////////////////////////////////////////////////////////////////////////////
13 // Button, public: 28 // Button, public:
14 29
15 Button::~Button() { 30 Button::~Button() {
16 } 31 }
17 32
18 void Button::SetTooltipText(const base::string16& tooltip_text) { 33 void Button::SetTooltipText(const base::string16& tooltip_text) {
19 tooltip_text_ = tooltip_text; 34 tooltip_text_ = tooltip_text;
20 if (accessible_name_.empty()) 35 if (accessible_name_.empty())
21 accessible_name_ = tooltip_text_; 36 accessible_name_ = tooltip_text_;
22 TooltipTextChanged(); 37 TooltipTextChanged();
(...skipping 30 matching lines...) Expand all
53 } 68 }
54 69
55 void Button::NotifyClick(const ui::Event& event) { 70 void Button::NotifyClick(const ui::Event& event) {
56 // We can be called when there is no listener, in cases like double clicks on 71 // We can be called when there is no listener, in cases like double clicks on
57 // menu buttons etc. 72 // menu buttons etc.
58 if (listener_) 73 if (listener_)
59 listener_->ButtonPressed(this, event); 74 listener_->ButtonPressed(this, event);
60 } 75 }
61 76
62 } // namespace views 77 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698