ash/shell.h - Issue 10202012: Revert 133691 because it accidentally reverted revs 133686 and 133684.

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/shell.h

Issue 10202012: Revert 133691 because it accidentally reverted revs 133686 and 133684. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 8 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:

View side-by-side diff with in-line comments

Download patch

Index: ash/shell.h

===================================================================

--- ash/shell.h (revision 133697)

+++ ash/shell.h (working copy)

@@ -365,11 +365,7 @@

// Owned by aura::RootWindow, cached here for type safety.

internal::RootWindowLayoutManager* root_window_layout_;

- // Status area with clock, Wi-Fi signal, etc.

- views::Widget* status_widget_;

- // System tray with clock, Wi-Fi signal, etc. (a replacement in progress for

- // |status_widget_|).

+ // System tray with clock, Wi-Fi signal, etc.

scoped_ptr<SystemTray> tray_;

// Used by ash/shell.

Property changes on: ash/shell.h

___________________________________________________________________

Added: svn:mergeinfo

« no previous file with comments | « ash/focus_cycler_unittest.cc ('k') | ash/shell.cc » ('j') | no next file with comments »