ash/system/tray/system_tray.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/tray/system_tray.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/tray/system_tray.cc

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

index 0b17757a599aafc7bd57ba5537af65e4f9fa61b7..6962514fb6044add3f5a0f2a2bc025500d8c2962 100644

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

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

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

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

#include "ash/ash_switches.h"

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

#include "ash/shell.h"

#include "ash/shell/panel_window.h"

#include "ash/shell_window_ids.h"

@@ -32,7 +33,6 @@

#include "ash/system/tray_update.h"

#include "ash/system/user/login_status.h"

#include "ash/system/user/tray_user.h"

-#include "ash/wm/shelf_layout_manager.h"

#include "base/command_line.h"

#include "base/logging.h"

#include "base/timer.h"

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