ash/system/web_notification/web_notification_tray.cc - Issue 499163002: Use qualified path for grit/ui_strings.h

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

Issue 499163002: Use qualified path for grit/ui_strings.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 4 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/frame/caption_buttons/frame_caption_button_container_view.cc ('k') | chrome/browser/notifications/message_center_settings_controller.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/system/web_notification/web_notification_tray.h"	5 #include "ash/system/web_notification/web_notification_tray.h"

6	6

7 #include "ash/ash_switches.h"	7 #include "ash/ash_switches.h"

8 #include "ash/root_window_controller.h"	8 #include "ash/root_window_controller.h"

9 #include "ash/shelf/shelf_layout_manager.h"	9 #include "ash/shelf/shelf_layout_manager.h"

10 #include "ash/shelf/shelf_layout_manager_observer.h"	10 #include "ash/shelf/shelf_layout_manager_observer.h"

11 #include "ash/shelf/shelf_widget.h"	11 #include "ash/shelf/shelf_widget.h"

12 #include "ash/shell.h"	12 #include "ash/shell.h"

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

14 #include "ash/system/status_area_widget.h"	14 #include "ash/system/status_area_widget.h"

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

16 #include "ash/system/tray/tray_background_view.h"	16 #include "ash/system/tray/tray_background_view.h"

17 #include "ash/system/tray/tray_bubble_wrapper.h"	17 #include "ash/system/tray/tray_bubble_wrapper.h"

18 #include "ash/system/tray/tray_constants.h"	18 #include "ash/system/tray/tray_constants.h"

19 #include "ash/system/tray/tray_utils.h"	19 #include "ash/system/tray/tray_utils.h"

20 #include "ash/system/web_notification/ash_popup_alignment_delegate.h"	20 #include "ash/system/web_notification/ash_popup_alignment_delegate.h"

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

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

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

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

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

26 #include "grit/ui_strings.h"

27 #include "ui/aura/window.h"	26 #include "ui/aura/window.h"

28 #include "ui/aura/window_event_dispatcher.h"	27 #include "ui/aura/window_event_dispatcher.h"

29 #include "ui/base/l10n/l10n_util.h"	28 #include "ui/base/l10n/l10n_util.h"

30 #include "ui/gfx/screen.h"	29 #include "ui/gfx/screen.h"

31 #include "ui/message_center/message_center_style.h"	30 #include "ui/message_center/message_center_style.h"

32 #include "ui/message_center/message_center_tray_delegate.h"	31 #include "ui/message_center/message_center_tray_delegate.h"

33 #include "ui/message_center/views/message_bubble_base.h"	32 #include "ui/message_center/views/message_bubble_base.h"

34 #include "ui/message_center/views/message_center_bubble.h"	33 #include "ui/message_center/views/message_center_bubble.h"

35 #include "ui/message_center/views/message_popup_collection.h"	34 #include "ui/message_center/views/message_popup_collection.h"

	35 #include "ui/strings/grit/ui_strings.h"

36 #include "ui/views/bubble/tray_bubble_view.h"	36 #include "ui/views/bubble/tray_bubble_view.h"

37 #include "ui/views/controls/button/custom_button.h"	37 #include "ui/views/controls/button/custom_button.h"

38 #include "ui/views/controls/image_view.h"	38 #include "ui/views/controls/image_view.h"

39 #include "ui/views/controls/label.h"	39 #include "ui/views/controls/label.h"

40 #include "ui/views/controls/menu/menu_runner.h"	40 #include "ui/views/controls/menu/menu_runner.h"

41 #include "ui/views/layout/fill_layout.h"	41 #include "ui/views/layout/fill_layout.h"

42	42

43 #if defined(OS_CHROMEOS)	43 #if defined(OS_CHROMEOS)

44	44

45 namespace message_center {	45 namespace message_center {

(...skipping 447 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
493	493

494 message_center::MessageCenterBubble*	494 message_center::MessageCenterBubble*

495 WebNotificationTray::GetMessageCenterBubbleForTest() {	495 WebNotificationTray::GetMessageCenterBubbleForTest() {

496 if (!message_center_bubble())	496 if (!message_center_bubble())

497 return NULL;	497 return NULL;

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

499 message_center_bubble()->bubble());	499 message_center_bubble()->bubble());

500 }	500 }

501	501

502 } // namespace ash	502 } // namespace ash

OLD	NEW