diff options
| author | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-24 16:11:39 +0000 |
|---|---|---|
| committer | sadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-24 16:11:39 +0000 |
| commit | 860f594adad88104987735b515344f7491b1e8ff (patch) | |
| tree | 70581b5c8b447c706cf005eb8550da7e612ac448 /ash/shell.h | |
| parent | 69d5be3f63008c46a937ffb9e62d230ec50ac981 (diff) | |
| download | chromium_src-860f594adad88104987735b515344f7491b1e8ff.zip chromium_src-860f594adad88104987735b515344f7491b1e8ff.tar.gz chromium_src-860f594adad88104987735b515344f7491b1e8ff.tar.bz2 | |
Revert 133691 because it accidentally reverted revs 133686 and 133684.
TBR=sadrul@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10202012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133699 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
| -rw-r--r-- | ash/shell.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ash/shell.h b/ash/shell.h index 56a12c3..74ff8fc 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -365,11 +365,7 @@ class ASH_EXPORT Shell { // 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. |