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

Side by Side Diff: ash/common/system/tray/tray_notification_view.cc

Issue 2576133002: chromeos: Remove OS ifdefs from ash/common/system/tray (Closed)
Patch Set: review comments Created 4 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
« no previous file with comments | « ash/common/system/tray/tray_image_item.cc ('k') | no next file » | 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) 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
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 #if defined(OS_CHROMEOS)
33 case IDR_AURA_UBER_TRAY_SMS: 32 case IDR_AURA_UBER_TRAY_SMS:
34 return kSystemMenuSmsIcon; 33 return kSystemMenuSmsIcon;
35 #endif
36 default: 34 default:
37 NOTREACHED(); 35 NOTREACHED();
38 break; 36 break;
39 } 37 }
40 38
41 return gfx::kNoneIcon; 39 return gfx::kNoneIcon;
42 } 40 }
43 41
44 } // namespace 42 } // namespace
45 43
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 OnClose(); 163 OnClose();
166 owner_->HideNotificationView(); 164 owner_->HideNotificationView();
167 } 165 }
168 166
169 void TrayNotificationView::HandleClickAction() { 167 void TrayNotificationView::HandleClickAction() {
170 HandleClose(); 168 HandleClose();
171 OnClickAction(); 169 OnClickAction();
172 } 170 }
173 171
174 } // namespace ash 172 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/tray/tray_image_item.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698