diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 04:34:55 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-12 04:34:55 +0000 |
| commit | 049d781e00a4f74668ff008d4db363195cadaa8f (patch) | |
| tree | 66a70c0f579b6ebb915131eb5bba2aa1e66c5e86 /ash | |
| parent | cf6d0b3ccfb8ac71cde074be1db2be4729792f5d (diff) | |
| download | chromium_src-049d781e00a4f74668ff008d4db363195cadaa8f.zip chromium_src-049d781e00a4f74668ff008d4db363195cadaa8f.tar.gz chromium_src-049d781e00a4f74668ff008d4db363195cadaa8f.tar.bz2 | |
Revert r131902 "Close all widgets/windows while message loop is still active"
TBR=oshima@chromium.org
BUG=104998
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10066005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131928 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/shell.cc | 5 | ||||
| -rw-r--r-- | ash/system/tray/system_tray_delegate.h | 3 |
2 files changed, 0 insertions, 8 deletions
diff --git a/ash/shell.cc b/ash/shell.cc index 75552bb..0d30ef1 100644 --- a/ash/shell.cc +++ b/ash/shell.cc @@ -489,9 +489,6 @@ class DummySystemTrayDelegate : public SystemTrayDelegate { virtual void ChangeProxySettings() OVERRIDE { } - virtual void OnTrayDestroyed() OVERRIDE { - } - bool muted_; bool wifi_enabled_; bool cellular_enabled_; @@ -570,7 +567,6 @@ Shell::~Shell() { // The system tray needs to be reset before all the windows are destroyed. tray_.reset(); - tray_delegate_->OnTrayDestroyed(); // Desroy secondary monitor's widgets before all the windows are destroyed. monitor_controller_.reset(); @@ -593,7 +589,6 @@ Shell::~Shell() { window_cycle_controller_.reset(); event_client_.reset(); monitor_controller_.reset(); - tooltip_controller_.reset(); // Launcher widget has a InputMethodBridge that references to // input_method_filter_'s input_method_. So explicitly release launcher_ diff --git a/ash/system/tray/system_tray_delegate.h b/ash/system/tray/system_tray_delegate.h index b06e2bd..dbc5722 100644 --- a/ash/system/tray/system_tray_delegate.h +++ b/ash/system/tray/system_tray_delegate.h @@ -236,9 +236,6 @@ class SystemTrayDelegate { // Shows UI for changing proxy settings. virtual void ChangeProxySettings() = 0; - - // Called when the tray is destroyed. - virtual void OnTrayDestroyed() = 0; }; } // namespace ash |