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

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

Issue 117983002: Prefix string16 with base:: in ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge Created 7 years 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
« no previous file with comments | « ui/views/controls/button/button.h ('k') | ui/views/controls/button/checkbox.h » ('j') | 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) 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, public: 13 // Button, public:
14 14
15 Button::~Button() { 15 Button::~Button() {
16 } 16 }
17 17
18 void Button::SetTooltipText(const string16& tooltip_text) { 18 void Button::SetTooltipText(const base::string16& tooltip_text) {
19 tooltip_text_ = tooltip_text; 19 tooltip_text_ = tooltip_text;
20 if (accessible_name_.empty()) 20 if (accessible_name_.empty())
21 accessible_name_ = tooltip_text_; 21 accessible_name_ = tooltip_text_;
22 TooltipTextChanged(); 22 TooltipTextChanged();
23 } 23 }
24 24
25 void Button::SetAccessibleName(const string16& name) { 25 void Button::SetAccessibleName(const base::string16& name) {
26 accessible_name_ = name; 26 accessible_name_ = name;
27 } 27 }
28 28
29 //////////////////////////////////////////////////////////////////////////////// 29 ////////////////////////////////////////////////////////////////////////////////
30 // Button, View overrides: 30 // Button, View overrides:
31 31
32 bool Button::GetTooltipText(const gfx::Point& p, string16* tooltip) const { 32 bool Button::GetTooltipText(const gfx::Point& p,
33 base::string16* tooltip) const {
33 if (tooltip_text_.empty()) 34 if (tooltip_text_.empty())
34 return false; 35 return false;
35 36
36 *tooltip = tooltip_text_; 37 *tooltip = tooltip_text_;
37 return true; 38 return true;
38 } 39 }
39 40
40 void Button::GetAccessibleState(ui::AccessibleViewState* state) { 41 void Button::GetAccessibleState(ui::AccessibleViewState* state) {
41 state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON; 42 state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
42 state->name = accessible_name_; 43 state->name = accessible_name_;
43 } 44 }
44 45
45 //////////////////////////////////////////////////////////////////////////////// 46 ////////////////////////////////////////////////////////////////////////////////
46 // Button, protected: 47 // Button, protected:
47 48
48 Button::Button(ButtonListener* listener) 49 Button::Button(ButtonListener* listener)
49 : listener_(listener), 50 : listener_(listener),
50 tag_(-1) { 51 tag_(-1) {
51 SetAccessibilityFocusable(true); 52 SetAccessibilityFocusable(true);
52 } 53 }
53 54
54 void Button::NotifyClick(const ui::Event& event) { 55 void Button::NotifyClick(const ui::Event& event) {
55 // We can be called when there is no listener, in cases like double clicks on 56 // We can be called when there is no listener, in cases like double clicks on
56 // menu buttons etc. 57 // menu buttons etc.
57 if (listener_) 58 if (listener_)
58 listener_->ButtonPressed(this, event); 59 listener_->ButtonPressed(this, event);
59 } 60 }
60 61
61 } // namespace views 62 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/controls/button/button.h ('k') | ui/views/controls/button/checkbox.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698