diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-10 22:57:09 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-12-10 22:57:09 +0000 |
| commit | a0afeb1aafd479aed625b2a6c6e0fc02b5348962 (patch) | |
| tree | 5a69548fe6278196c3dc69bfb1758cfa01444057 /ash/shell.h | |
| parent | 6d6587c3b5f3d1a3a5b7b03272c957a44d6acc71 (diff) | |
| download | chromium_src-a0afeb1aafd479aed625b2a6c6e0fc02b5348962.zip chromium_src-a0afeb1aafd479aed625b2a6c6e0fc02b5348962.tar.gz chromium_src-a0afeb1aafd479aed625b2a6c6e0fc02b5348962.tar.bz2 | |
[Launcher per display] Removed Shell::status_area_widget(), system_tray()
HasPrimaryStatusArea/GetPrimarySystemTray for login screen
which will have only one tray/status area on primary
BUG=145978
TEST=none
Review URL: https://chromiumcodereview.appspot.com/11476033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172169 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/shell.h')
| -rw-r--r-- | ash/shell.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/ash/shell.h b/ash/shell.h index 346c977..3a21dfd 100644 --- a/ash/shell.h +++ b/ash/shell.h @@ -148,9 +148,11 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate, static void DeleteInstance(); // Returns the root window controller for the primary root window. + // TODO(oshima): move this to |RootWindowController| static internal::RootWindowController* GetPrimaryRootWindowController(); // Returns all root window controllers. + // TODO(oshima): move this to |RootWindowController| static RootWindowControllerList GetAllRootWindowControllers(); // Returns the primary RootWindow. The primary RootWindow is the one @@ -358,13 +360,11 @@ class ASH_EXPORT Shell : internal::SystemModalContainerEventFilterDelegate, // Returns WebNotificationTray on the primary root window. WebNotificationTray* GetWebNotificationTray(); - // Convenience accessor for members of StatusAreaWidget. - // NOTE: status_area_widget() may return NULL during shutdown; - // tray_delegate() and system_tray() will crash if called after - // status_area_widget() has been destroyed; check status_area_widget() - // before calling these in destructors. - internal::StatusAreaWidget* status_area_widget(); - SystemTray* system_tray(); + // Does the primary display have status area? + bool HasPrimaryStatusArea(); + + // Returns the system tray on primary display. + SystemTray* GetPrimarySystemTray(); // TODO(stevenjb): Rename to system_tray_delegate(). SystemTrayDelegate* tray_delegate() { |