ash/wm/shelf_layout_manager_unittest.cc - Issue 11415014: Stop using shell::GetInstance()->system_tray() in system tray items

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/wm/shelf_layout_manager_unittest.cc

Issue 11415014: Stop using shell::GetInstance()->system_tray() in system tray items (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 1 month 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/wm/shelf_layout_manager_unittest.cc

diff --git a/ash/wm/shelf_layout_manager_unittest.cc b/ash/wm/shelf_layout_manager_unittest.cc

index 984ef6c2ebc8748a54a38df4292eb2ebd6b10e0b..73e76d11f7af60eb9596afc1aedcc159cdca068c 100644

--- a/ash/wm/shelf_layout_manager_unittest.cc

+++ b/ash/wm/shelf_layout_manager_unittest.cc

@@ -93,7 +93,8 @@ class TestItem : public SystemTrayItem {

return tray_view_;

}

- virtual views::View* CreateDefaultView(user::LoginStatus status) OVERRIDE {

+ virtual views::View* CreateDefaultView(user::LoginStatus status,

+ int bubble_width) OVERRIDE {

default_view_ = new views::View;

default_view_->SetLayoutManager(new views::FillLayout);

default_view_->AddChildView(new views::Label(UTF8ToUTF16("Default")));