OLD | NEW |
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 #include "ash/system/tray/tray_item_more.h" | 5 #include "ash/system/tray/tray_item_more.h" |
6 | 6 |
7 #include "ash/system/tray/system_tray_item.h" | 7 #include "ash/system/tray/system_tray_item.h" |
8 #include "ash/system/tray/tray_constants.h" | 8 #include "ash/system/tray/tray_constants.h" |
9 #include "ash/system/tray/tray_views.h" | 9 #include "ash/system/tray/tray_views.h" |
10 #include "grit/ui_resources.h" | 10 #include "grit/ui_resources.h" |
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
53 void TrayItemMore::SetAccessibleName(const string16& name) { | 53 void TrayItemMore::SetAccessibleName(const string16& name) { |
54 accessible_name_ = name; | 54 accessible_name_ = name; |
55 } | 55 } |
56 | 56 |
57 void TrayItemMore::ReplaceIcon(views::View* view) { | 57 void TrayItemMore::ReplaceIcon(views::View* view) { |
58 delete icon_; | 58 delete icon_; |
59 icon_ = NULL; | 59 icon_ = NULL; |
60 AddChildViewAt(view, 0); | 60 AddChildViewAt(view, 0); |
61 } | 61 } |
62 | 62 |
63 bool TrayItemMore::PerformAction(const views::Event& event) { | 63 bool TrayItemMore::PerformAction(const ui::Event& event) { |
64 owner_->TransitionDetailedView(); | 64 owner_->TransitionDetailedView(); |
65 return true; | 65 return true; |
66 } | 66 } |
67 | 67 |
68 void TrayItemMore::Layout() { | 68 void TrayItemMore::Layout() { |
69 // Let the box-layout do the layout first. Then move the '>' arrow to right | 69 // Let the box-layout do the layout first. Then move the '>' arrow to right |
70 // align. | 70 // align. |
71 views::View::Layout(); | 71 views::View::Layout(); |
72 | 72 |
73 // Make sure the chevron always has the full size. | 73 // Make sure the chevron always has the full size. |
(...skipping 11 matching lines...) Expand all Loading... |
85 } | 85 } |
86 } | 86 } |
87 | 87 |
88 void TrayItemMore::GetAccessibleState(ui::AccessibleViewState* state) { | 88 void TrayItemMore::GetAccessibleState(ui::AccessibleViewState* state) { |
89 state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON; | 89 state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON; |
90 state->name = accessible_name_; | 90 state->name = accessible_name_; |
91 } | 91 } |
92 | 92 |
93 } // namespace internal | 93 } // namespace internal |
94 } // namespace ash | 94 } // namespace ash |
OLD | NEW |