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

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

Issue 12449009: Remove 'Message center' text from ash_strings. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 9 months 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 | Annotate | Revision Log
« no previous file with comments | « ash/ash_strings.grd ('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/system/web_notification/web_notification_tray.h" 5 #include "ash/system/web_notification/web_notification_tray.h"
6 6
7 #include "ash/root_window_controller.h" 7 #include "ash/root_window_controller.h"
8 #include "ash/shelf/shelf_layout_manager.h" 8 #include "ash/shelf/shelf_layout_manager.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/shell_window_ids.h" 10 #include "ash/shell_window_ids.h"
11 #include "ash/system/status_area_widget.h" 11 #include "ash/system/status_area_widget.h"
12 #include "ash/system/tray/tray_background_view.h" 12 #include "ash/system/tray/tray_background_view.h"
13 #include "ash/system/tray/tray_bubble_wrapper.h" 13 #include "ash/system/tray/tray_bubble_wrapper.h"
14 #include "ash/system/tray/tray_constants.h" 14 #include "ash/system/tray/tray_constants.h"
15 #include "grit/ash_resources.h" 15 #include "grit/ash_resources.h"
16 #include "grit/ash_strings.h" 16 #include "grit/ui_strings.h"
17 #include "ui/aura/root_window.h" 17 #include "ui/aura/root_window.h"
18 #include "ui/aura/window.h" 18 #include "ui/aura/window.h"
19 #include "ui/base/l10n/l10n_util.h" 19 #include "ui/base/l10n/l10n_util.h"
20 #include "ui/base/resource/resource_bundle.h" 20 #include "ui/base/resource/resource_bundle.h"
21 #include "ui/gfx/screen.h" 21 #include "ui/gfx/screen.h"
22 #include "ui/message_center/message_center_tray_delegate.h" 22 #include "ui/message_center/message_center_tray_delegate.h"
23 #include "ui/message_center/message_center_util.h" 23 #include "ui/message_center/message_center_util.h"
24 #include "ui/message_center/views/message_bubble_base.h" 24 #include "ui/message_center/views/message_bubble_base.h"
25 #include "ui/message_center/views/message_center_bubble.h" 25 #include "ui/message_center/views/message_center_bubble.h"
26 #include "ui/message_center/views/message_popup_bubble.h" 26 #include "ui/message_center/views/message_popup_bubble.h"
(...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 if (popup_collection_.get()) 306 if (popup_collection_.get())
307 popup_collection_->UpdatePopups(); 307 popup_collection_->UpdatePopups();
308 if (message_center_bubble()) { 308 if (message_center_bubble()) {
309 message_center_bubble()->bubble_view()->UpdateBubble(); 309 message_center_bubble()->bubble_view()->UpdateBubble();
310 UpdateBubbleViewArrow(message_center_bubble()->bubble_view()); 310 UpdateBubbleViewArrow(message_center_bubble()->bubble_view());
311 } 311 }
312 } 312 }
313 313
314 string16 WebNotificationTray::GetAccessibleNameForTray() { 314 string16 WebNotificationTray::GetAccessibleNameForTray() {
315 return l10n_util::GetStringUTF16( 315 return l10n_util::GetStringUTF16(
316 IDS_ASH_WEB_NOTIFICATION_TRAY_ACCESSIBLE_NAME); 316 IDS_MESSAGE_CENTER_ACCESSIBLE_NAME);
317 } 317 }
318 318
319 void WebNotificationTray::HideBubbleWithView( 319 void WebNotificationTray::HideBubbleWithView(
320 const views::TrayBubbleView* bubble_view) { 320 const views::TrayBubbleView* bubble_view) {
321 if (message_center_bubble() && 321 if (message_center_bubble() &&
322 bubble_view == message_center_bubble()->bubble_view()) { 322 bubble_view == message_center_bubble()->bubble_view()) {
323 message_center_tray_->HideMessageCenterBubble(); 323 message_center_tray_->HideMessageCenterBubble();
324 } else if ((popup_bubble() && bubble_view == popup_bubble()->bubble_view()) || 324 } else if ((popup_bubble() && bubble_view == popup_bubble()->bubble_view()) ||
325 popup_collection_.get()) { 325 popup_collection_.get()) {
326 message_center_tray_->HidePopupBubble(); 326 message_center_tray_->HidePopupBubble();
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 444
445 message_center::MessagePopupBubble* 445 message_center::MessagePopupBubble*
446 WebNotificationTray::GetPopupBubbleForTest() { 446 WebNotificationTray::GetPopupBubbleForTest() {
447 if (!popup_bubble()) 447 if (!popup_bubble())
448 return NULL; 448 return NULL;
449 return static_cast<message_center::MessagePopupBubble*>( 449 return static_cast<message_center::MessagePopupBubble*>(
450 popup_bubble()->bubble()); 450 popup_bubble()->bubble());
451 } 451 }
452 452
453 } // namespace ash 453 } // namespace ash
OLDNEW
« no previous file with comments | « ash/ash_strings.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698