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

Side by Side Diff: ash/common/system/web_notification/web_notification_tray.cc

Issue 2591553002: Remove non-cros support from ash/common/system. (Closed)
Patch Set: jc review + rebase 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/user/tray_user_unittest.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/web_notification/web_notification_tray.h" 5 #include "ash/common/system/web_notification/web_notification_tray.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/session/session_state_delegate.h" 8 #include "ash/common/session/session_state_delegate.h"
9 #include "ash/common/shelf/shelf_constants.h" 9 #include "ash/common/shelf/shelf_constants.h"
10 #include "ash/common/shelf/wm_shelf.h" 10 #include "ash/common/shelf/wm_shelf.h"
(...skipping 27 matching lines...) Expand all
38 #include "ui/message_center/views/message_bubble_base.h" 38 #include "ui/message_center/views/message_bubble_base.h"
39 #include "ui/message_center/views/message_center_bubble.h" 39 #include "ui/message_center/views/message_center_bubble.h"
40 #include "ui/message_center/views/message_popup_collection.h" 40 #include "ui/message_center/views/message_popup_collection.h"
41 #include "ui/strings/grit/ui_strings.h" 41 #include "ui/strings/grit/ui_strings.h"
42 #include "ui/views/bubble/tray_bubble_view.h" 42 #include "ui/views/bubble/tray_bubble_view.h"
43 #include "ui/views/controls/image_view.h" 43 #include "ui/views/controls/image_view.h"
44 #include "ui/views/controls/label.h" 44 #include "ui/views/controls/label.h"
45 #include "ui/views/controls/menu/menu_runner.h" 45 #include "ui/views/controls/menu/menu_runner.h"
46 #include "ui/views/layout/fill_layout.h" 46 #include "ui/views/layout/fill_layout.h"
47 47
48 #if defined(OS_CHROMEOS)
49
50 namespace message_center { 48 namespace message_center {
51 49
52 MessageCenterTrayDelegate* CreateMessageCenterTray() { 50 MessageCenterTrayDelegate* CreateMessageCenterTray() {
53 // On Windows+Ash the Tray will not be hosted in ash::Shell. 51 // On non-CrOS, the Tray will not be hosted in ash::Shell.
54 NOTREACHED(); 52 NOTREACHED();
55 return nullptr; 53 return nullptr;
56 } 54 }
57 55
58 } // namespace message_center 56 } // namespace message_center
59 57
60 #endif // defined(OS_CHROMEOS)
61
62 namespace ash { 58 namespace ash {
63 namespace { 59 namespace {
64 60
65 // Menu commands 61 // Menu commands
66 constexpr int kToggleQuietMode = 0; 62 constexpr int kToggleQuietMode = 0;
67 constexpr int kEnableQuietModeDay = 2; 63 constexpr int kEnableQuietModeDay = 2;
68 64
69 constexpr int kMaximumSmallIconCount = 3; 65 constexpr int kMaximumSmallIconCount = 3;
70 66
71 constexpr gfx::Size kTrayItemInnerIconSize(16, 16); 67 constexpr gfx::Size kTrayItemInnerIconSize(16, 16);
(...skipping 599 matching lines...) Expand 10 before | Expand all | Expand 10 after
671 667
672 message_center::MessageCenterBubble* 668 message_center::MessageCenterBubble*
673 WebNotificationTray::GetMessageCenterBubbleForTest() { 669 WebNotificationTray::GetMessageCenterBubbleForTest() {
674 if (!message_center_bubble()) 670 if (!message_center_bubble())
675 return nullptr; 671 return nullptr;
676 return static_cast<message_center::MessageCenterBubble*>( 672 return static_cast<message_center::MessageCenterBubble*>(
677 message_center_bubble()->bubble()); 673 message_center_bubble()->bubble());
678 } 674 }
679 675
680 } // namespace ash 676 } // namespace ash
OLDNEW
« no previous file with comments | « ash/common/system/user/tray_user_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698