OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 "chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h" | 5 #include "chrome/browser/ui/cocoa/notifications/message_center_tray_bridge.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/i18n/number_formatting.h" | 8 #include "base/i18n/number_formatting.h" |
9 #include "base/message_loop/message_loop.h" | 9 #include "base/message_loop/message_loop.h" |
10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
11 #include "grit/chromium_strings.h" | 11 #include "grit/chromium_strings.h" |
| 12 #include "grit/generated_resources.h" |
12 #include "grit/ui_strings.h" | 13 #include "grit/ui_strings.h" |
13 #include "ui/base/l10n/l10n_util.h" | 14 #include "ui/base/l10n/l10n_util.h" |
14 #import "ui/base/l10n/l10n_util_mac.h" | 15 #import "ui/base/l10n/l10n_util_mac.h" |
15 #import "ui/message_center/cocoa/popup_collection.h" | 16 #import "ui/message_center/cocoa/popup_collection.h" |
16 #import "ui/message_center/cocoa/status_item_view.h" | 17 #import "ui/message_center/cocoa/status_item_view.h" |
17 #import "ui/message_center/cocoa/tray_controller.h" | 18 #import "ui/message_center/cocoa/tray_controller.h" |
| 19 #import "ui/message_center/cocoa/tray_view_controller.h" |
18 #include "ui/message_center/message_center.h" | 20 #include "ui/message_center/message_center.h" |
19 #include "ui/message_center/message_center_tray.h" | 21 #include "ui/message_center/message_center_tray.h" |
20 | 22 |
21 namespace message_center { | 23 namespace message_center { |
22 | 24 |
23 MessageCenterTrayDelegate* CreateMessageCenterTray() { | 25 MessageCenterTrayDelegate* CreateMessageCenterTray() { |
24 return new MessageCenterTrayBridge(g_browser_process->message_center()); | 26 return new MessageCenterTrayBridge(g_browser_process->message_center()); |
25 } | 27 } |
26 | 28 |
27 } // namespace message_center | 29 } // namespace message_center |
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
112 } else { | 114 } else { |
113 [status_item_view_ setToolTip: | 115 [status_item_view_ setToolTip: |
114 l10n_util::GetNSString(IDS_MESSAGE_CENTER_TOOLTIP)]; | 116 l10n_util::GetNSString(IDS_MESSAGE_CENTER_TOOLTIP)]; |
115 } | 117 } |
116 } | 118 } |
117 | 119 |
118 void MessageCenterTrayBridge::OpenTrayWindow() { | 120 void MessageCenterTrayBridge::OpenTrayWindow() { |
119 DCHECK(!tray_controller_); | 121 DCHECK(!tray_controller_); |
120 tray_controller_.reset( | 122 tray_controller_.reset( |
121 [[MCTrayController alloc] initWithMessageCenterTray:tray_.get()]); | 123 [[MCTrayController alloc] initWithMessageCenterTray:tray_.get()]); |
| 124 [[tray_controller_ viewController] setTrayTitle: |
| 125 l10n_util::GetNSStringF(IDS_MESSAGE_CENTER_FOOTER_WITH_PRODUCT_TITLE, |
| 126 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_NAME))]; |
122 | 127 |
123 UpdateStatusItem(); | 128 UpdateStatusItem(); |
124 | 129 |
125 [status_item_view_ setHighlight:YES]; | 130 [status_item_view_ setHighlight:YES]; |
126 NSRect frame = [[status_item_view_ window] frame]; | 131 NSRect frame = [[status_item_view_ window] frame]; |
127 [tray_controller_ showTrayAtRightOf:NSMakePoint(NSMinX(frame), | 132 [tray_controller_ showTrayAtRightOf:NSMakePoint(NSMinX(frame), |
128 NSMinY(frame)) | 133 NSMinY(frame)) |
129 atLeftOf:NSMakePoint(NSMaxX(frame), | 134 atLeftOf:NSMakePoint(NSMaxX(frame), |
130 NSMinY(frame))]; | 135 NSMinY(frame))]; |
131 } | 136 } |
OLD | NEW |