ash/system/tray/system_tray_unittest.cc - Issue 11017079: Remove Shell::shelf()|status_area_widget()|launcher()

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/tray/system_tray_unittest.cc

Issue 11017079: Remove Shell::shelf()|status_area_widget()|launcher() (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 8 years, 2 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/tray/system_tray_unittest.cc

diff --git a/ash/system/tray/system_tray_unittest.cc b/ash/system/tray/system_tray_unittest.cc

index b03c548a14ff0f405661e05fafa812349dd31fc6..54f34b8ac73f9d9788e3badb2e87fb1d5323eeb0 100644

--- a/ash/system/tray/system_tray_unittest.cc

+++ b/ash/system/tray/system_tray_unittest.cc

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

#include <vector>

+#include "ash/root_window_controller.h"

#include "ash/system/status_area_widget.h"

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

#include "ash/test/ash_test_base.h"

@@ -21,7 +22,8 @@ namespace test {

namespace {

SystemTray* GetSystemTray() {

- return Shell::GetInstance()->status_area_widget()->system_tray();

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

+ system_tray();

}

// Trivial item implementation that tracks its views for testing.

« no previous file with comments | « ash/system/tray/system_tray.cc ('k') | ash/system/tray/tray_background_view.h » ('j') | no next file with comments »