ash/system/tray/system_tray.cc - Issue 11428100: Add NULL check in SystemTray::ShowDetailedView.

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.cc

Issue 11428100: Add NULL check in SystemTray::ShowDetailedView. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Add a test. 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/system/tray/system_tray.cc

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

index e1890daadac86ae353ebcd0020904e1f4415a70b..00a04c08e1f91fec08bf7c8d7428456f58249910 100644

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

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

@@ -238,7 +238,8 @@ void SystemTray::ShowDetailedView(SystemTrayItem* item,

std::vector<SystemTrayItem*> items;

items.push_back(item);

ShowItems(items, true, activate, creation_type, GetTrayXOffset(item));

- system_bubble_->bubble()->StartAutoCloseTimer(close_delay);

+ if (system_bubble_.get())

+ system_bubble_->bubble()->StartAutoCloseTimer(close_delay);

}

void SystemTray::SetDetailedViewCloseDelay(int close_delay) {

« no previous file with comments | « no previous file | ash/system/tray/system_tray_unittest.cc » ('j') | no next file with comments »