ash/system/web_notification/web_notification_tray.cc - Issue 12313118: Refactor: Shelf Widget

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

Issue 12313118: Refactor: Shelf Widget (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

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:

« ash/system/ime/tray_ime.cc ('K') | « ash/system/tray_update.cc ('k') | ash/system/web_notification/web_notification_tray_unittest.cc » ('j') | chrome/browser/ui/ash/launcher/shell_window_launcher_item_controller.cc » ('J')
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/root_window_controller.h"	7 #include "ash/root_window_controller.h"

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

8 #include "ash/shell.h"	9 #include "ash/shell.h"

9 #include "ash/shell_window_ids.h"	10 #include "ash/shell_window_ids.h"

10 #include "ash/system/status_area_widget.h"	11 #include "ash/system/status_area_widget.h"

11 #include "ash/system/tray/tray_background_view.h"	12 #include "ash/system/tray/tray_background_view.h"

12 #include "ash/system/tray/tray_bubble_wrapper.h"	13 #include "ash/system/tray/tray_bubble_wrapper.h"

13 #include "ash/system/tray/tray_constants.h"	14 #include "ash/system/tray/tray_constants.h"

14 #include "ash/wm/shelf_layout_manager.h"	15 #include "ash/system/tray/tray_views.h"

	16 #include "base/message_loop.h"
	Mr4D (OOO till 08-26) 2013/03/02 02:02:12 Are you sure you need this? Are you sure you need this? Harry McCleave 2013/03/04 02:47:41 Done. Show quoted text On 2013/03/02 02:02:12, Mr4D wrote: > Are you sure you need this? Done.
	17 #include "base/stringprintf.h"
	Mr4D (OOO till 08-26) 2013/03/02 02:02:12 Are you sure you need this? Are you sure you need this? Harry McCleave 2013/03/04 02:47:41 Done. Show quoted text On 2013/03/02 02:02:12, Mr4D wrote: > Are you sure you need this? Done.
15 #include "grit/ash_resources.h"	18 #include "grit/ash_resources.h"

16 #include "grit/ash_strings.h"	19 #include "grit/ash_strings.h"

17 #include "ui/aura/root_window.h"	20 #include "ui/aura/root_window.h"

18 #include "ui/aura/window.h"	21 #include "ui/aura/window.h"

19 #include "ui/base/l10n/l10n_util.h"	22 #include "ui/base/l10n/l10n_util.h"

20 #include "ui/base/resource/resource_bundle.h"	23 #include "ui/base/resource/resource_bundle.h"

21 #include "ui/gfx/screen.h"	24 #include "ui/gfx/screen.h"

22 #include "ui/message_center/message_bubble_base.h"	25 #include "ui/message_center/message_bubble_base.h"

23 #include "ui/message_center/message_center_bubble.h"	26 #include "ui/message_center/message_center_bubble.h"

24 #include "ui/message_center/message_center_tray_delegate.h"	27 #include "ui/message_center/message_center_tray_delegate.h"

(...skipping 426 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
451	454

452 message_center::MessagePopupBubble*	455 message_center::MessagePopupBubble*

453 WebNotificationTray::GetPopupBubbleForTest() {	456 WebNotificationTray::GetPopupBubbleForTest() {

454 if (!popup_bubble())	457 if (!popup_bubble())

455 return NULL;	458 return NULL;

456 return static_cast<message_center::MessagePopupBubble*>(	459 return static_cast<message_center::MessagePopupBubble*>(

457 popup_bubble()->bubble());	460 popup_bubble()->bubble());

458 }	461 }

459	462

460 } // namespace ash	463 } // namespace ash

OLD	NEW