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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/system/web_notification/web_notification_tray_unittest.cc

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

Patch Set: safer shutdown (status_area_widget_) 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:

Index: ash/system/web_notification/web_notification_tray_unittest.cc

diff --git a/ash/system/web_notification/web_notification_tray_unittest.cc b/ash/system/web_notification/web_notification_tray_unittest.cc

index b58845c587758a6ac515bbe5b8a86c10e7be9450..6bbc758b85cae5eb8c72756f4d1beb723c870613 100644

--- a/ash/system/web_notification/web_notification_tray_unittest.cc

+++ b/ash/system/web_notification/web_notification_tray_unittest.cc

@@ -7,6 +7,7 @@

#include <vector>

#include "ash/root_window_controller.h"

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

#include "ash/system/status_area_widget.h"

#include "ash/system/tray/system_tray_item.h"

#include "ash/test/ash_test_base.h"

@@ -33,8 +34,8 @@ namespace ash {

namespace {

WebNotificationTray* GetWebNotificationTray() {

- return Shell::GetPrimaryRootWindowController()->status_area_widget()->

- web_notification_tray();

+ return Shell::GetPrimaryRootWindowController()->shelf()->

+ status_area_widget()->web_notification_tray();

}

message_center::MessageCenter* get_message_center() {