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

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

Issue 2808723004: Renames WmShell to ShellPort (Closed)
Patch Set: feedback Created 3 years, 8 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
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/public/cpp/shell_window_ids.h" 7 #include "ash/public/cpp/shell_window_ids.h"
8 #include "ash/resources/vector_icons/vector_icons.h" 8 #include "ash/resources/vector_icons/vector_icons.h"
9 #include "ash/root_window_controller.h" 9 #include "ash/root_window_controller.h"
10 #include "ash/session/session_controller.h" 10 #include "ash/session/session_controller.h"
11 #include "ash/shelf/shelf_constants.h" 11 #include "ash/shelf/shelf_constants.h"
12 #include "ash/shelf/wm_shelf.h" 12 #include "ash/shelf/wm_shelf.h"
13 #include "ash/shelf/wm_shelf_util.h" 13 #include "ash/shelf/wm_shelf_util.h"
14 #include "ash/shell.h" 14 #include "ash/shell.h"
15 #include "ash/strings/grit/ash_strings.h" 15 #include "ash/strings/grit/ash_strings.h"
16 #include "ash/system/status_area_widget.h" 16 #include "ash/system/status_area_widget.h"
17 #include "ash/system/tray/system_tray.h" 17 #include "ash/system/tray/system_tray.h"
18 #include "ash/system/tray/system_tray_delegate.h" 18 #include "ash/system/tray/system_tray_delegate.h"
19 #include "ash/system/tray/tray_bubble_wrapper.h" 19 #include "ash/system/tray/tray_bubble_wrapper.h"
20 #include "ash/system/tray/tray_constants.h" 20 #include "ash/system/tray/tray_constants.h"
21 #include "ash/system/tray/tray_utils.h" 21 #include "ash/system/tray/tray_utils.h"
22 #include "ash/system/web_notification/ash_popup_alignment_delegate.h" 22 #include "ash/system/web_notification/ash_popup_alignment_delegate.h"
23 #include "ash/wm_shell.h"
24 #include "ash/wm_window.h" 23 #include "ash/wm_window.h"
25 #include "base/auto_reset.h" 24 #include "base/auto_reset.h"
26 #include "base/i18n/number_formatting.h" 25 #include "base/i18n/number_formatting.h"
27 #include "base/i18n/rtl.h" 26 #include "base/i18n/rtl.h"
28 #include "base/strings/utf_string_conversions.h" 27 #include "base/strings/utf_string_conversions.h"
29 #include "base/threading/thread_task_runner_handle.h" 28 #include "base/threading/thread_task_runner_handle.h"
30 #include "ui/base/l10n/l10n_util.h" 29 #include "ui/base/l10n/l10n_util.h"
31 #include "ui/display/display.h" 30 #include "ui/display/display.h"
32 #include "ui/display/screen.h" 31 #include "ui/display/screen.h"
33 #include "ui/gfx/paint_vector_icon.h" 32 #include "ui/gfx/paint_vector_icon.h"
(...skipping 593 matching lines...) Expand 10 before | Expand all | Expand 10 after
627 626
628 message_center::MessageCenterBubble* 627 message_center::MessageCenterBubble*
629 WebNotificationTray::GetMessageCenterBubbleForTest() { 628 WebNotificationTray::GetMessageCenterBubbleForTest() {
630 if (!message_center_bubble()) 629 if (!message_center_bubble())
631 return nullptr; 630 return nullptr;
632 return static_cast<message_center::MessageCenterBubble*>( 631 return static_cast<message_center::MessageCenterBubble*>(
633 message_center_bubble()->bubble()); 632 message_center_bubble()->bubble());
634 } 633 }
635 634
636 } // namespace ash 635 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698