| 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 "grit/ash_resources.h" | 10 #include "grit/ash_resources.h" |
| (...skipping 12 matching lines...) Expand all Loading... |
| 23 namespace { | 23 namespace { |
| 24 | 24 |
| 25 // Maps a non-MD PNG resource id to its corresponding MD vector icon id. | 25 // Maps a non-MD PNG resource id to its corresponding MD vector icon id. |
| 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 gfx::VectorIconId ResourceIdToVectorIconId(int resource_id) { | 28 gfx::VectorIconId ResourceIdToVectorIconId(int resource_id) { |
| 29 gfx::VectorIconId vector_id = gfx::VectorIconId::VECTOR_ICON_NONE; | 29 gfx::VectorIconId vector_id = gfx::VectorIconId::VECTOR_ICON_NONE; |
| 30 switch (resource_id) { | 30 switch (resource_id) { |
| 31 case IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK: | 31 case IDR_AURA_UBER_TRAY_ACCESSIBILITY_DARK: |
| 32 return gfx::VectorIconId::SYSTEM_MENU_ACCESSIBILITY; | 32 return gfx::VectorIconId::SYSTEM_MENU_ACCESSIBILITY; |
| 33 #if defined(OS_CHROMEOS) |
| 33 case IDR_AURA_UBER_TRAY_SMS: | 34 case IDR_AURA_UBER_TRAY_SMS: |
| 34 return gfx::VectorIconId::SYSTEM_MENU_SMS; | 35 return gfx::VectorIconId::SYSTEM_MENU_SMS; |
| 36 #endif |
| 35 default: | 37 default: |
| 36 NOTREACHED(); | 38 NOTREACHED(); |
| 37 break; | 39 break; |
| 38 } | 40 } |
| 39 | 41 |
| 40 return vector_id; | 42 return vector_id; |
| 41 } | 43 } |
| 42 | 44 |
| 43 } // namespace | 45 } // namespace |
| 44 | 46 |
| (...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 164 OnClose(); | 166 OnClose(); |
| 165 owner_->HideNotificationView(); | 167 owner_->HideNotificationView(); |
| 166 } | 168 } |
| 167 | 169 |
| 168 void TrayNotificationView::HandleClickAction() { | 170 void TrayNotificationView::HandleClickAction() { |
| 169 HandleClose(); | 171 HandleClose(); |
| 170 OnClickAction(); | 172 OnClickAction(); |
| 171 } | 173 } |
| 172 | 174 |
| 173 } // namespace ash | 175 } // namespace ash |
| OLD | NEW |