ash/common/system/web_notification/web_notification_tray.cc - Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common

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

Issue 2148593004: mash: Move StatusTray and StatusAreaWidget to //ash/common (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@traydisplay

Patch Set: rebase Created 4 years, 5 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

« no previous file with comments | « ash/common/system/user/user_view.cc ('k') | ash/display/window_tree_host_manager.cc » ('j') | no next file with comments »

OLD	NEW
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/ash_switches.h"	7 #include "ash/common/ash_switches.h"

8 #include "ash/common/material_design/material_design_controller.h"	8 #include "ash/common/material_design/material_design_controller.h"

9 #include "ash/common/session/session_state_delegate.h"	9 #include "ash/common/session/session_state_delegate.h"

10 #include "ash/common/shelf/shelf_constants.h"	10 #include "ash/common/shelf/shelf_constants.h"

11 #include "ash/common/shelf/wm_shelf.h"	11 #include "ash/common/shelf/wm_shelf.h"

12 #include "ash/common/shelf/wm_shelf_util.h"	12 #include "ash/common/shelf/wm_shelf_util.h"

13 #include "ash/common/shell_window_ids.h"	13 #include "ash/common/shell_window_ids.h"

	14 #include "ash/common/system/tray/system_tray.h"

14 #include "ash/common/system/tray/system_tray_delegate.h"	15 #include "ash/common/system/tray/system_tray_delegate.h"

15 #include "ash/common/system/tray/tray_bubble_wrapper.h"	16 #include "ash/common/system/tray/tray_bubble_wrapper.h"

16 #include "ash/common/system/tray/tray_constants.h"	17 #include "ash/common/system/tray/tray_constants.h"

17 #include "ash/common/system/tray/tray_utils.h"	18 #include "ash/common/system/tray/tray_utils.h"

18 #include "ash/common/system/web_notification/ash_popup_alignment_delegate.h"	19 #include "ash/common/system/web_notification/ash_popup_alignment_delegate.h"

19 #include "ash/common/wm_lookup.h"	20 #include "ash/common/wm_lookup.h"

20 #include "ash/common/wm_root_window_controller.h"	21 #include "ash/common/wm_root_window_controller.h"

21 #include "ash/common/wm_shell.h"	22 #include "ash/common/wm_shell.h"

22 #include "ash/common/wm_window.h"	23 #include "ash/common/wm_window.h"

23 #include "ash/system/tray/system_tray.h"

24 #include "base/auto_reset.h"	24 #include "base/auto_reset.h"

25 #include "base/i18n/number_formatting.h"	25 #include "base/i18n/number_formatting.h"

26 #include "base/i18n/rtl.h"	26 #include "base/i18n/rtl.h"

27 #include "base/strings/utf_string_conversions.h"	27 #include "base/strings/utf_string_conversions.h"

28 #include "base/threading/thread_task_runner_handle.h"	28 #include "base/threading/thread_task_runner_handle.h"

29 #include "grit/ash_strings.h"	29 #include "grit/ash_strings.h"

30 #include "ui/base/l10n/l10n_util.h"	30 #include "ui/base/l10n/l10n_util.h"

31 #include "ui/display/display.h"	31 #include "ui/display/display.h"

32 #include "ui/display/screen.h"	32 #include "ui/display/screen.h"

33 #include "ui/gfx/paint_vector_icon.h"	33 #include "ui/gfx/paint_vector_icon.h"

(...skipping 495 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
529	529

530 message_center::MessageCenterBubble*	530 message_center::MessageCenterBubble*

531 WebNotificationTray::GetMessageCenterBubbleForTest() {	531 WebNotificationTray::GetMessageCenterBubbleForTest() {

532 if (!message_center_bubble())	532 if (!message_center_bubble())

533 return NULL;	533 return NULL;

534 return static_cast<message_center::MessageCenterBubble*>(	534 return static_cast<message_center::MessageCenterBubble*>(

535 message_center_bubble()->bubble());	535 message_center_bubble()->bubble());

536 }	536 }

537	537

538 } // namespace ash	538 } // namespace ash

OLD	NEW