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/common/system/tray/tray_notification_view.h" | 5 #include "ash/common/system/tray/tray_notification_view.h" |
6 | 6 |
7 #include "ash/common/material_design/material_design_controller.h" | 7 #include "ash/common/material_design/material_design_controller.h" |
8 #include "ash/common/system/tray/system_tray_item.h" | 8 #include "ash/common/system/tray/system_tray_item.h" |
9 #include "ash/common/system/tray/tray_constants.h" | 9 #include "ash/common/system/tray/tray_constants.h" |
10 #include "ash/resources/vector_icons/vector_icons.h" | 10 #include "ash/resources/vector_icons/vector_icons.h" |
(...skipping 11 matching lines...) Expand all Loading... |
22 | 22 |
23 namespace { | 23 namespace { |
24 | 24 |
25 // Maps a non-MD PNG resource id to its corresponding MD vector icon. | 25 // Maps a non-MD PNG resource id to its corresponding MD vector icon. |
26 // TODO(tdanderson): Remove this once material design is enabled by | 26 // TODO(tdanderson): Remove this once material design is enabled by |
27 // default. See crbug.com/614453. | 27 // default. See crbug.com/614453. |
28 const gfx::VectorIcon& ResourceIdToVectorIcon(int resource_id) { | 28 const gfx::VectorIcon& ResourceIdToVectorIcon(int resource_id) { |
29 switch (resource_id) { | 29 switch (resource_id) { |
30 case IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK: | 30 case IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK: |
31 return kSystemMenuAccessibilityIcon; | 31 return kSystemMenuAccessibilityIcon; |
32 case IDR_AURA_UBER_TRAY_SMS: | |
33 return kSystemMenuSmsIcon; | |
34 default: | 32 default: |
35 NOTREACHED(); | 33 NOTREACHED(); |
36 break; | 34 break; |
37 } | 35 } |
38 | 36 |
39 return gfx::kNoneIcon; | 37 return gfx::kNoneIcon; |
40 } | 38 } |
41 | 39 |
42 } // namespace | 40 } // namespace |
43 | 41 |
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
163 OnClose(); | 161 OnClose(); |
164 owner_->HideNotificationView(); | 162 owner_->HideNotificationView(); |
165 } | 163 } |
166 | 164 |
167 void TrayNotificationView::HandleClickAction() { | 165 void TrayNotificationView::HandleClickAction() { |
168 HandleClose(); | 166 HandleClose(); |
169 OnClickAction(); | 167 OnClickAction(); |
170 } | 168 } |
171 | 169 |
172 } // namespace ash | 170 } // namespace ash |
OLD | NEW |